[Xfce4-commits] <xfce4-panel:master> Wait for the wm selection not the compositing (bug #7727).

[Nick Schermer]

Updating branch refs/heads/master
         to e3e6be1c591c8e9cce625722866a1c7b129ecdfd (commit)
       from 6c5777f78ba8b3e5f309fb22d034e188d7a21f00 (commit)

commit e3e6be1c591c8e9cce625722866a1c7b129ecdfd
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jun 19 13:47:19 2011 +0200

    Wait for the wm selection not the compositing (bug #7727).

 panel/panel-application.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index 2a7ddd2..b7e3911 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -147,7 +147,7 @@ typedef struct
   PanelApplication *application;
 
   Display          *dpy;
-  Atom              wm_cm_atom;
+  Atom              wm_atom;
   guint             have_wm : 1;
   guint             counter;
 }
@@ -409,7 +409,7 @@ panel_application_wait_for_window_manager (gpointer data)
 {
   WaitForWM *wfwm = data;
 
-  if (XGetSelectionOwner (wfwm->dpy, wfwm->wm_cm_atom) != None)
+  if (XGetSelectionOwner (wfwm->dpy, wfwm->wm_atom) != None)
     wfwm->have_wm = TRUE;
 
   /* abort if a window manager is found or 5 seconds expired */
@@ -1185,7 +1185,7 @@ panel_application_load (PanelApplication  *application,
       wfwm = g_slice_new0 (WaitForWM);
       wfwm->application = application;
       wfwm->dpy = XOpenDisplay (NULL);
-      wfwm->wm_cm_atom = XInternAtom (wfwm->dpy, "_NET_WM_CM_S0", False);
+      wfwm->wm_atom = XInternAtom (wfwm->dpy, "WM_S0", False);
       wfwm->have_wm = FALSE;
       wfwm->counter = 0;