[Xfce4-commits] r28278 - xfdesktop/trunk/src

[Brian Tarricone]

Author: kelnos
Date: 2008-10-17 09:14:10 +0000 (Fri, 17 Oct 2008)
New Revision: 28278

Modified:
   xfdesktop/trunk/src/main.c
   xfdesktop/trunk/src/xfce-backdrop.c
Log:
reset SM restart style hint to SmRestartIfRunning when quitting cleanly

Modified: xfdesktop/trunk/src/main.c
===================================================================
--- xfdesktop/trunk/src/main.c  2008-10-17 09:05:07 UTC (rev 28277)
+++ xfdesktop/trunk/src/main.c  2008-10-17 09:14:10 UTC (rev 28278)
@@ -173,6 +173,10 @@
                                                    GDK_CURRENT_TIME);
             return TRUE;
         } else if(!strcmp(QUIT_MESSAGE, evt->data.b)) {
+            if(is_session_managed) {
+                client_session_set_restart_style(client_session,
+                                                 SESSION_RESTART_IF_RUNNING);
+            }
             gtk_main_quit();
             return TRUE;
         }
@@ -289,10 +293,14 @@
 
     already_running = xfdesktop_check_is_running(&xid);
     if(already_running) {
-        DBG("xfdesktop is running");
-        if(!message)
+        if(!message) {
+            g_printerr("%s[%d] is already running; assuming --reload\n",
+                       PACKAGE, (int)getpid());
             message = RELOAD_MESSAGE;
+        }
     }
+
+    g_print("%s[%d]: starting up\n", PACKAGE, getpid());
     
     if(message) {
         if(!already_running)

Modified: xfdesktop/trunk/src/xfce-backdrop.c
===================================================================
--- xfdesktop/trunk/src/xfce-backdrop.c 2008-10-17 09:05:07 UTC (rev 28277)
+++ xfdesktop/trunk/src/xfce-backdrop.c 2008-10-17 09:14:10 UTC (rev 28278)
@@ -922,7 +922,6 @@
     if(backdrop->priv->brightness != 0)
         final_image = adjust_brightness(final_image, 
backdrop->priv->brightness);
 
-    g_debug("saturation is %.4f", backdrop->priv->saturation);
     if(backdrop->priv->saturation > 1.01 || backdrop->priv->saturation < 0.99) 
{
         gdk_pixbuf_saturate_and_pixelate(final_image, final_image,
                                          (gfloat)backdrop->priv->saturation,

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits