X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstartupnotify.c;h=5b5723e591ecf545597273e32e64b95582a1224a;hb=a8a93d7d39b3cc82a25d99c9c639c97a5facbfec;hp=51e78e261da6d0e1fbbb37a6b0460c44b3318377;hpb=fc5b9a56121e1da230ae77dea0ef91979a4660e3;p=chaz%2Fopenbox

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 51e78e26..5b5723e5 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -24,7 +24,10 @@
 
 #ifndef USE_LIBSN
 
-void sn_startup(gboolean reconfig) {}
+void sn_startup(gboolean reconfig) {
+    /* unset this so we don't pass it on unknowingly */
+    if (!reconfig) unsetenv("DESKTOP_STARTUP_ID");
+}
 void sn_shutdown(gboolean reconfig) {}
 gboolean sn_app_starting() { return FALSE; }
 Time sn_app_started(const gchar *id, const gchar *wmclass)
@@ -59,6 +62,9 @@ void sn_startup(gboolean reconfig)
 {
     if (reconfig) return;
 
+    /* unset this so we don't pass it on unknowingly */
+    unsetenv("DESKTOP_STARTUP_ID");
+
     sn_display = sn_display_new(ob_display, NULL, NULL);
     sn_context = sn_monitor_context_new(sn_display, ob_screen,
                                         sn_event_func, NULL, NULL);
@@ -138,6 +144,7 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
            have a timeout */
         ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC,
                                  sn_wait_timeout, seq,
+                                 g_direct_equal,
                                  (GDestroyNotify)sn_startup_sequence_unref);
         change = TRUE;
         break;
@@ -250,6 +257,7 @@ void sn_setup_spawn_environment(gchar *program, gchar *name,
     sn_launcher_context_ref(sn_launcher);
     ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC,
                              sn_launch_wait_timeout, sn_launcher,
+                             g_direct_equal,
                              (GDestroyNotify)sn_launcher_context_unref);
 
     setenv("DESKTOP_STARTUP_ID", id, TRUE);