brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: Do not set pid or title on foreign windows

Browse Source 
If a StageX11 is using a foreign window we should not need to set the
_NET_WM_PID or the WM_TITLE properies.

http://bugzilla.openedhand.com/show_bug.cgi?id=1989
This commit is contained in:
Emmanuele Bassi 2010-02-15 11:45:35 +00:00
parent 89191e8bbc
commit d607400f01
1 changed files with 3 additions and 3 deletions

6
clutter/x11/clutter-stage-x11.c

@ -270,7 +270,7 @@ set_wm_pid (ClutterStageX11 *stage_x11)
ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend); ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
long pid; long pid;
if (stage_x11->xwin == None) if (stage_x11->xwin == None || stage_x11->is_foreign_xwin)
return; return;
/* this will take care of WM_CLIENT_MACHINE and WM_LOCALE_NAME */ /* this will take care of WM_CLIENT_MACHINE and WM_LOCALE_NAME */
@ -280,7 +280,7 @@ set_wm_pid (ClutterStageX11 *stage_x11)
NULL, 0, NULL, 0,
NULL, NULL, NULL); NULL, NULL, NULL);
pid = getpid(); pid = getpid ();
XChangeProperty (backend_x11->xdpy, XChangeProperty (backend_x11->xdpy,
stage_x11->xwin, stage_x11->xwin,
backend_x11->atom_NET_WM_PID, XA_CARDINAL, 32, backend_x11->atom_NET_WM_PID, XA_CARDINAL, 32,
@ -297,7 +297,7 @@ set_wm_title (ClutterStageX11 *stage_x11)
g_return_if_fail (CLUTTER_IS_BACKEND_X11 (backend)); g_return_if_fail (CLUTTER_IS_BACKEND_X11 (backend));
backend_x11 = CLUTTER_BACKEND_X11 (backend); backend_x11 = CLUTTER_BACKEND_X11 (backend);
if (stage_x11->xwin == None) if (stage_x11->xwin == None || stage_x11->is_foreign_xwin)
return; return;
if (stage_x11->title == NULL) if (stage_x11->title == NULL)