Merge branch 'master' into chaz

[chaz/openbox] / openbox / startupnotify.c

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 06fbb6c8e74bb08fe6e6c4de4b2c24b8730e367b..e249002b106bd4299b1eb60227b7e0de54331e39 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -116,7 +116,6 @@ static gboolean sn_wait_timeout(gpointer data)
     SnStartupSequence *seq = data;
     sn_waits = g_slist_remove(sn_waits, seq);
     screen_set_root_cursor();
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -229,7 +228,6 @@ static gboolean sn_launch_wait_timeout(gpointer data)
 {
     SnLauncherContext *sn = data;
     sn_launcher_context_complete(sn);
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -265,7 +263,7 @@ void sn_setup_spawn_environment(const gchar *program, const gchar *name,
                        20 * 1000, sn_launch_wait_timeout, sn_launcher,
                        (GDestroyNotify)sn_launcher_context_unref);
 
-    setenv("DESKTOP_STARTUP_ID", id, TRUE);
+    g_setenv("DESKTOP_STARTUP_ID", id, TRUE);
 
     g_free(desc);
 }