X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fstartupnotify.c;h=4c929e7eaf12c786e31fd10895f5acaef009a4c7;hb=cccc57fdb04b2e5602254f1eb623acc95f9a032e;hp=f1b067c7a36b4e84515c06a8bfd2c5982817f356;hpb=fbc7607fbd1a380428a53094e727ac7631871bd4;p=chaz%2Fopenbox

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index f1b067c7..4c929e7e 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -34,7 +34,7 @@ Time sn_app_started(const gchar *id, const gchar *wmclass)
 }
 gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
 void sn_setup_spawn_environment(gchar *program, gchar *name,
-                                gchar *icon_name, gint desktop, Time time) {}
+                                gchar *icon_name, gint desktop) {}
 void sn_spawn_cancel() {}
 
 #else
@@ -61,7 +61,7 @@ void sn_startup(gboolean reconfig)
     if (reconfig) return;
 
     /* unset this so we don't pass it on unknowingly */
-    unsetenv("DESKTOP_STARTUP_ID");
+    putenv("DESKTOP_STARTUP_ID");
 
     sn_display = sn_display_new(ob_display, NULL, NULL);
     sn_context = sn_monitor_context_new(sn_display, ob_screen,
@@ -106,7 +106,7 @@ static SnStartupSequence* sequence_find(const gchar *id)
     return ret;
 }
 
-gboolean sn_app_starting()
+gboolean sn_app_starting(void)
 {
     return sn_waits != NULL;
 }
@@ -243,7 +243,8 @@ void sn_setup_spawn_environment(gchar *program, gchar *name,
 
     sn_launcher_context_set_name(sn_launcher, name ? name : program);
     sn_launcher_context_set_description(sn_launcher, desc);
-    sn_launcher_context_set_icon_name(sn_launcher, icon_name ? icon_name : program);
+    sn_launcher_context_set_icon_name(sn_launcher, icon_name ?
+                                      icon_name : program);
     sn_launcher_context_set_binary_name(sn_launcher, program);
     if (desktop >= 0 && (unsigned) desktop < screen_num_desktops)
         sn_launcher_context_set_workspace(sn_launcher, (signed) desktop);
@@ -258,12 +259,12 @@ void sn_setup_spawn_environment(gchar *program, gchar *name,
                              g_direct_equal,
                              (GDestroyNotify)sn_launcher_context_unref);
 
-    setenv("DESKTOP_STARTUP_ID", id, TRUE);
+    putenv(g_strdup_printf("DESKTOP_STARTUP_ID=%s", id));
 
     g_free(desc);
 }
 
-void sn_spawn_cancel()
+void sn_spawn_cancel(void)
 {
     sn_launcher_context_complete(sn_launcher);
 }