From d607400f01be1c1e26f54b3d83794e0d246e8db0 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 15 Feb 2010 11:45:35 +0000 Subject: [PATCH] x11: Do not set pid or title on foreign windows 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 --- clutter/x11/clutter-stage-x11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c index 754dcc2..38229ed 100644 --- a/clutter/x11/clutter-stage-x11.c +++ b/clutter/x11/clutter-stage-x11.c @@ -270,7 +270,7 @@ set_wm_pid (ClutterStageX11 *stage_x11) ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend); long pid; - if (stage_x11->xwin == None) + if (stage_x11->xwin == None || stage_x11->is_foreign_xwin) return; /* 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, NULL, NULL); - pid = getpid(); + pid = getpid (); XChangeProperty (backend_x11->xdpy, stage_x11->xwin, 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)); backend_x11 = CLUTTER_BACKEND_X11 (backend); - if (stage_x11->xwin == None) + if (stage_x11->xwin == None || stage_x11->is_foreign_xwin) return; if (stage_x11->title == NULL) -- 2.7.4