X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstartupnotify.c;h=66258c821869d750cabd7f7d03008980cac593d8;hb=f189b02f857eb5cc80ca925ccb4b0e97c3614bcd;hp=8866e40a1b1cfe66e4ca081b652acb96bd147b80;hpb=1d6e2c13573a6dcbcefd292b23130f3734cf2f1b;p=chaz%2Fopenbox

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 8866e40a..66258c82 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   startupnotify.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "startupnotify.h"
 
 #ifndef USE_LIBSN
@@ -50,6 +69,8 @@ void sn_shutdown(gboolean reconfig)
 
     if (reconfig) return;
 
+    ob_main_loop_x_remove(ob_main_loop, sn_handler);
+
     for (it = sn_waits; it; it = g_slist_next(it))
         wait_data_free(it->data);
     g_slist_free(sn_waits);
@@ -141,7 +162,6 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
 
     switch (sn_monitor_event_get_type(ev)) {
     case SN_MONITOR_EVENT_INITIATED:
-        g_message("starting");
         d = wait_data_new(seq);
         sn_waits = g_slist_prepend(sn_waits, d);
         /* 30 second timeout for apps to start */
@@ -157,7 +177,8 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
     case SN_MONITOR_EVENT_CANCELED:
         if ((d = wait_find(sn_startup_sequence_get_id(seq)))) {
             d->feedback = FALSE;
-            ob_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout, d);
+            ob_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout,
+                                             d, FALSE);
             change = TRUE;
         }
         break;