merge r5713 from trunk

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 4c2672c1857c5f3ed580702cebb7f1ae9fd4b598..51e78e261da6d0e1fbbb37a6b0460c44b3318377 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -33,10 +33,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)
-{
-    return g_strdupv(environ);
-}
+                                gchar *icon_name, gint desktop, Time time) {}
 void sn_spawn_cancel() {}
 
 #else