[Xfce4-commits] r29288 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-01-21 19:02:13 +0000 (Wed, 21 Jan 2009)
New Revision: 29288

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/main.c
Log:
	* src/main.c: Command line option "--daemon" would have no effect 
	  when xfwm4 connects to the session manager.

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-01-21 10:54:53 UTC (rev 29287)
+++ xfwm4/trunk/ChangeLog	2009-01-21 19:02:13 UTC (rev 29288)
@@ -1,3 +1,8 @@
+2009-01-21	olivier
+
+	* src/main.c: Command line option "--daemon" would have no effect 
+	  when xfwm4 connects to the session manager.
+
 2009-01-20	olivier
 
 	* mcs-plugin: Removed.

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-01-21 10:54:53 UTC (rev 29287)
+++ xfwm4/trunk/NEWS	2009-01-21 19:02:13 UTC (rev 29288)
@@ -2,6 +2,8 @@
 ======================
 
 - Fix a crash when removing a monitor with xrandr 1.2
+- Command line option "--daemon" would have no effect when xfwm4 connects to 
+  the session manager (Bug #4839).
 
 4.5.93 (Xfce 4.6beta3)
 ======================

Modified: xfwm4/trunk/src/main.c
===================================================================
--- xfwm4/trunk/src/main.c	2009-01-21 10:54:53 UTC (rev 29287)
+++ xfwm4/trunk/src/main.c	2009-01-21 19:02:13 UTC (rev 29288)
@@ -589,6 +589,7 @@
             exit (1);
             break;
         case 0:
+        case 1:
             if (daemon_mode)
             {
 #ifdef HAVE_DAEMON
@@ -616,8 +617,6 @@
                 }
 #endif /* !HAVE_DAEMON */
             }
-            /* Walk through */
-        case 1:
             /* enter GTK main loop */
             gtk_main ();
             break;