revert my commit of d3th, it fucked up focus badly

[chaz/openbox] / openbox / startupnotify.c

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 6d1ba5ad623298166e00ce8f27bb294cdb148e9c..ebe6e6b3fdb8481f68057768b083a6291c33c355 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -5,7 +5,8 @@
 void sn_startup(gboolean reconfig) {}
 void sn_shutdown(gboolean reconfig) {}
 gboolean sn_app_starting() { return FALSE; }
-void sn_app_started(gchar *wmclass, guint *desktop) {}
+void sn_app_started(gchar *wmclass) {}
+gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
 
 #else
 
@@ -49,6 +50,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);
@@ -140,7 +143,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 */