[Xfce4-commits] r30279 - in libxfce4ui/trunk: libxfce4smclient-private libxfce4ui

[Nick Schermer]

Author: nick
Date: 2009-07-11 12:17:28 +0000 (Sat, 11 Jul 2009)
New Revision: 30279

Modified:
   libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c
   libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.c
   libxfce4ui/trunk/libxfce4ui/xfce-gdk-extensions.c
Log:
Make sure the xsmp backend is always used.


Modified: libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c
===================================================================
--- libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c	2009-07-11 12:15:44 UTC (rev 30278)
+++ libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c	2009-07-11 12:17:28 UTC (rev 30279)
@@ -194,9 +194,6 @@
 EggSMClient *
 egg_sm_client_xsmp_new (void)
 {
-  if (!g_getenv ("SESSION_MANAGER"))
-    return NULL;
-
   return g_object_new (EGG_TYPE_SM_CLIENT_XSMP, NULL);
 }
 

Modified: libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.c
===================================================================
--- libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.c	2009-07-11 12:15:44 UTC (rev 30278)
+++ libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.c	2009-07-11 12:17:28 UTC (rev 30279)
@@ -322,22 +322,10 @@
       if (global_client_mode != EGG_SM_CLIENT_MODE_DISABLED &&
     !sm_client_disable)
   {
-#if defined (GDK_WINDOWING_WIN32)
-    global_client = egg_sm_client_win32_new ();
-#elif defined (GDK_WINDOWING_QUARTZ)
+#ifdef PLATFORM_OSX
     global_client = egg_sm_client_osx_new ();
 #else
-    /* If both D-Bus and XSMP are compiled in, try XSMP first
-     * (since it supports state saving) and fall back to D-Bus
-     * if XSMP isn't available.
-     */
-# ifdef EGG_SM_CLIENT_BACKEND_XSMP
     global_client = egg_sm_client_xsmp_new ();
-# endif
-# ifdef EGG_SM_CLIENT_BACKEND_DBUS
-    if (!global_client)
-      global_client = egg_sm_client_dbus_new ();
-# endif
 #endif
   }
 

Modified: libxfce4ui/trunk/libxfce4ui/xfce-gdk-extensions.c
===================================================================
--- libxfce4ui/trunk/libxfce4ui/xfce-gdk-extensions.c	2009-07-11 12:15:44 UTC (rev 30278)
+++ libxfce4ui/trunk/libxfce4ui/xfce-gdk-extensions.c	2009-07-11 12:17:28 UTC (rev 30279)
@@ -75,7 +75,7 @@
                              &root, &child, &rootx, &rooty, &winx, &winy, &xmask))
             {
               /* return the monitor number */
-              if (monitor_return)
+              if (monitor_return != NULL)
                 *monitor_return = gdk_screen_get_monitor_at_point (screen, rootx, rooty);
 
               /* yap, this screen contains the pointer, hence it's the active screen */