all repos — openbox @ 5c01dc651a220ad1ccce9502da577d81f1877388

openbox fork - make it a bit more like ryudo 

Get the session client id from new gnome-session

See http://live.gnome.org/SessionManagement/GnomeSession#A1._Launch

Gnome-session sets the DESKTOP_AUTOSTART_ID env variable with the SM client id
instead of passing it on the command line.
Dana Jansens danakj@orodu.net
commit

5c01dc651a220ad1ccce9502da577d81f1877388

parent

7e6ef2683f68d0b8cf75d4ebb6a778cd87288d7f

1 files changed, 13 insertions(+), 0 deletions(-)

jump to
M openbox/openbox.c → openbox/openbox.c 
@@ -561,8 +561,21 @@ }
 
 static void parse_env()
 {
+    const gchar *id;
+
     /* unset this so we don't pass it on unknowingly */
     unsetenv("DESKTOP_STARTUP_ID");
+
+    /* this is how gnome-session passes in a session client id */
+    id = g_getenv("DESKTOP_AUTOSTART_ID");
+    if (id) {
+        unsetenv("DESKTOP_AUTOSTART_ID");
+        if (ob_sm_id) g_free(ob_sm_id);
+        ob_sm_id = g_strdup(id);
+        ob_debug_type(OB_DEBUG_SM,
+                      "DESKTOP_AUTOSTART_ID %s supercedes --sm-client-id\n",
+                      ob_sm_id);
+    }
 }
 
 static void parse_args(gint *argc, gchar **argv)