use integers instead of atoms for the actual control action

diff --git a/openbox/event.c b/openbox/event.c
index daf87f54a1f8fed0a1df463258d24ac0c481ba7e..1e228eff09bd716564fc188c315dafe5d512b3f1 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -597,9 +597,9 @@ static void event_handle_root(XEvent *e)
         } else if (msgtype == prop_atoms.net_showing_desktop) {
             screen_show_desktop(e->xclient.data.l[0] != 0);
         } else if (msgtype == prop_atoms.ob_control) {
-            if ((Atom)e->xclient.data.l[0] == prop_atoms.ob_reconfigure)
+            if ((Atom)e->xclient.data.l[0] == 1)
                 action_run_string("reconfigure", NULL);
-            else if ((Atom)e->xclient.data.l[0] == prop_atoms.ob_restart)
+            else if ((Atom)e->xclient.data.l[0] == 2)
                 action_run_string("restart", NULL);
         }
         break;

diff --git a/openbox/openbox.c b/openbox/openbox.c
index a8b445d89942ef3d655614d65fa3b23ea659d808..2a8f422fc0ac202a0dae4fe186bbe3e6e3735fa5 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -87,7 +87,7 @@ static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
 static gint      exitcode = 0;
 static gboolean  message_and_exit = FALSE;
-static Atom     *message;
+static guint     message = 0;
 static gboolean  being_replaced = FALSE;
 
 static void signal_handler(gint signal, gpointer data);
@@ -132,9 +132,11 @@ gint main(gint argc, gchar **argv)
     if (message_and_exit) {
         prop_startup();
 
-        /* Send client message telling the OB process to reconfigure */
-        prop_message(RootWindow(ob_display, ob_screen), prop_atoms.ob_control,
-                     *message, 0, 0, 0, SubstructureNotifyMask);
+        /* Send client message telling the OB process to:
+         * message = 1 -> reconfigure 
+         * message = 2 -> restart */
+        PROP_MSG(RootWindow(ob_display, ob_screen),
+                 ob_control, message, 0, 0, 0);
         XCloseDisplay(ob_display);
         exit(0);
     }
@@ -433,10 +435,10 @@ static void parse_args(gint argc, gchar **argv)
             ob_debug_show_output(TRUE);
         } else if (!strcmp(argv[i], "--reconfigure")) {
             message_and_exit = TRUE;
-            message = &prop_atoms.ob_reconfigure;
+            message = 1;
         } else if (!strcmp(argv[i], "--restart")) {
             message_and_exit = TRUE;
-            message = &prop_atoms.ob_restart;
+            message = 2;
         }
     }
 }