X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=e4aae9e8969cd2be3cd5900380202baaf59a9bf2;hb=e39762b05b87e9f3d125450a1a27618f52de1354;hp=c192b4d07ec25b6efd7082cbe71c024b0afa0eee;hpb=4cf23f53e784af2ac97d1d87002996e542cda50c;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index c192b4d0..e4aae9e8 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -194,12 +194,14 @@ int main(int argc, char **argv)
 	timer_startup();
 	event_startup();
         grab_startup();
+        window_startup();
         plugin_startup();
         /* load the plugins specified in the pluginrc */
         plugin_loadall();
 
         /* set up the kernel config shit */
         config_startup();
+        menu_startup();
         /* parse/load user options */
         if (parse_load_rc(&doc, &node))
             parse_tree(doc, node->xmlChildrenNode, NULL);
@@ -211,8 +213,6 @@ int main(int argc, char **argv)
         if (ob_rr_theme == NULL)
             exit_with_error("Unable to load a theme.");
 
-        window_startup();
-        menu_startup();
         frame_startup();
         moveresize_startup();
 	focus_startup();
@@ -330,7 +330,7 @@ static void sm_startup(int argc, char **argv)
         SmProp *props[7];
         gulong hint, pri;
         gchar pid[32];
-        gint i;
+        gint i, j;
         gboolean has_id;
 
         for (i = 1; i < argc - 1; ++i)
@@ -340,27 +340,29 @@ static void sm_startup(int argc, char **argv)
 
         prop_cmd.vals = g_new(SmPropValue, (has_id ? argc-2 : argc));
         prop_cmd.num_vals = (has_id ? argc-2 : argc);
-        for (i = 0; i < argc; ++i) {
+        for (i = 0, j = 0; i < argc; ++i, ++j) {
             if (strcmp (argv[i], "-sm-client-id") == 0) {
-                ++i; /* skip the next as well */
+                ++i, --j; /* skip the next as well, keep j where it is */
             } else {
-                prop_cmd.vals[i].value = argv[i];
-                prop_cmd.vals[i].length = strlen(argv[i]);
+                prop_cmd.vals[j].value = argv[i];
+                prop_cmd.vals[j].length = strlen(argv[i]);
             }
         }
 
         prop_res.vals = g_new(SmPropValue, (has_id ? argc : argc+2));
         prop_res.num_vals = (has_id ? argc : argc+2);
-        for (i = 0; i < argc; ++i) {
-            prop_res.vals[i].value = argv[i];
-            prop_res.vals[i].length = strlen(argv[i]);
-        }
-        if (!has_id) {
-            prop_res.vals[i].value = "-sm-client-id";
-            prop_res.vals[i++].length = strlen("-sm-client-id");
-            prop_res.vals[i].value = ob_sm_id;
-            prop_res.vals[i++].length = strlen(ob_sm_id);
+        for (i = 0, j = 0; i < argc; ++i, ++j) { 
+            if (strcmp (argv[i], "-sm-client-id") == 0) {
+                ++i, --j; /* skip the next as well, keep j where it is */
+            } else {
+                prop_res.vals[j].value = argv[i];
+                prop_res.vals[j].length = strlen(argv[i]);
+            }
         }
+        prop_res.vals[j].value = "-sm-client-id";
+        prop_res.vals[j++].length = strlen("-sm-client-id");
+        prop_res.vals[j].value = ob_sm_id;
+        prop_res.vals[j++].length = strlen(ob_sm_id);
 
         val_prog.value = argv[0];
         val_prog.length = strlen(argv[0]);