merge r5723 from trunk

diff --git a/openbox/action.c b/openbox/action.c
index 9022333a1857faed249000b0961967254460c6f3..3b2aacdc8c595e1b37594db5449fe6af50b14730 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1122,6 +1122,7 @@ void action_execute(union ActionData *data)
                     g_error_free(e);
                     sn_spawn_cancel();
                 }
+                setenv("DESKTOP_STARTUP_ID");
                 g_free(program);
                 g_strfreev(argv);
             } else {