X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=ff226af4dcf30a72b815e08170d8247f59b3a0c0;hb=78cd9bba523f4986413e3aefe87704e9d11cd081;hp=00fe6e6e997310ef7b1e60308a6c4bb4bfb2ad16;hpb=4b73574406e24df84e909014926e56ab1e5c7934;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 00fe6e6e..ff226af4 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -42,7 +42,6 @@
 #include "menuframe.h"
 #include "grab.h"
 #include "group.h"
-#include "propwin.h"
 #include "config.h"
 #include "mainloop.h"
 #include "gettext.h"
@@ -129,7 +128,7 @@ gint main(gint argc, gchar **argv)
     if (chdir(g_get_home_dir()) == -1)
         g_message(_("Unable to change to home directory '%s': %s"),
                   g_get_home_dir(), g_strerror(errno));
-     
+
     /* parse the command line args, which can change the argv[0] */
     parse_args(&argc, argv);
     /* parse the environment variables */
@@ -155,7 +154,7 @@ gint main(gint argc, gchar **argv)
         prop_startup();
 
         /* Send client message telling the OB process to:
-         * remote_control = 1 -> reconfigure 
+         * remote_control = 1 -> reconfigure
          * remote_control = 2 -> restart */
         PROP_MSG(RootWindow(ob_display, ob_screen),
                  ob_control, remote_control, 0, 0, 0);
@@ -301,7 +300,6 @@ gint main(gint argc, gchar **argv)
             sn_startup(reconfigure);
             screen_startup(reconfigure);
             grab_startup(reconfigure);
-            propwin_startup(reconfigure);
             group_startup(reconfigure);
             client_startup(reconfigure);
             dock_startup(reconfigure);
@@ -363,7 +361,6 @@ gint main(gint argc, gchar **argv)
             dock_shutdown(reconfigure);
             client_shutdown(reconfigure);
             group_shutdown(reconfigure);
-            propwin_shutdown(reconfigure);
             grab_shutdown(reconfigure);
             screen_shutdown(reconfigure);
             focus_cycle_popup_shutdown(reconfigure);
@@ -443,7 +440,7 @@ gint main(gint argc, gchar **argv)
     g_free(ob_sm_save_file);
     g_free(ob_sm_id);
     g_free(program_name);
-     
+
     return exitcode;
 }
 
@@ -456,7 +453,7 @@ static void signal_handler(gint signal, gpointer data)
         break;
     case SIGUSR2:
         ob_debug("Caught signal %d. Reconfiguring.\n", signal);
-        ob_reconfigure(); 
+        ob_reconfigure();
         break;
     case SIGCHLD:
         /* reap children */
@@ -492,6 +489,7 @@ static void print_help()
     g_print(_("\nPassing messages to a running Openbox instance:\n"));
     g_print(_("  --reconfigure       Reload Openbox's configuration\n"));
     g_print(_("  --restart           Restart Openbox\n"));
+    g_print(_("  --exit              Exit Openbox\n"));
     g_print(_("\nDebugging options:\n"));
     g_print(_("  --sync              Run in synchronous mode\n"));
     g_print(_("  --debug             Display debugging output\n"));
@@ -514,7 +512,9 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num)
 static void parse_env()
 {
     /* unset this so we don't pass it on unknowingly */
-    unsetenv("DESKTOP_STARTUP_ID");
+    gchar *s = g_strdup("DESKTOP_STARTUP_ID");
+    putenv(s);
+    g_free(s);
 }
 
 static void parse_args(gint *argc, gchar **argv)
@@ -557,9 +557,13 @@ static void parse_args(gint *argc, gchar **argv)
         }
         else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;
-        } else if (!strcmp(argv[i], "--restart")) {
+        }
+        else if (!strcmp(argv[i], "--restart")) {
             remote_control = 2;
         }
+        else if (!strcmp(argv[i], "--exit")) {
+            remote_control = 3;
+        }
         else if (!strcmp(argv[i], "--sm-save-file")) {
             if (i == *argc - 1) /* no args left */
                 /* not translated cuz it's sekret */