unset DESKTOP_STARTUP_ID at startup so we don't pass it on unknowingly.

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 51e78e261da6d0e1fbbb37a6b0460c44b3318377..bf1f44ac3fa94fb9fbc41720fc93f9834c7220de 100644 (file)
--- 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);