consistant glib type usage

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 39c02035a988083d2edcfdae0cac73e47a218dc3..7c68e2a5d93b9bcbcbf357f88b5e7ab450295365 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -76,15 +76,15 @@ static ObState   state;
 static gboolean  xsync;
 static gboolean  reconfigure;
 static gboolean  restart;
-static char     *restart_path;
+static gchar    *restart_path;
 static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
 static gint      exitcode = 0;
 
-static void signal_handler(int signal, gpointer data);
-static void parse_args(int argc, char **argv);
+static void signal_handler(gint signal, gpointer data);
+static void parse_args(gint argc, gchar **argv);
 
-int main(int argc, char **argv)
+gint main(gint argc, gchar **argv)
 {
 #ifdef DEBUG
     ob_debug_show_output(TRUE);
@@ -132,8 +132,6 @@ int main(int argc, char **argv)
     if (ob_rr_inst == NULL)
         ob_exit_with_error("Failed to initialize the render library.");
 
-    /* XXX fork self onto other screens */
-     
     XSynchronize(ob_display, xsync);
 
     /* check for locale support */
@@ -207,7 +205,7 @@ int main(int argc, char **argv)
                 if (parse_load_rc(&doc, &node))
                     parse_tree(i, doc, node->xmlChildrenNode);
                 /* we're done with parsing now, kill it */
-                xmlFreeDoc(doc);
+                parse_close(doc);
                 parse_shutdown(i);
             }
 
@@ -289,6 +287,8 @@ int main(int argc, char **argv)
         } while (reconfigure);
     }
 
+    XSync(ob_display, FALSE);
+
     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
 
@@ -300,8 +300,8 @@ int main(int argc, char **argv)
 
     if (restart) {
         if (restart_path != NULL) {
-            int argcp;
-            char **argvp;
+            gint argcp;
+            gchar **argvp;
             GError *err = NULL;
 
             /* run other shit */
@@ -322,16 +322,16 @@ int main(int argc, char **argv)
     return exitcode;
 }
 
-static void signal_handler(int signal, gpointer data)
+static void signal_handler(gint signal, gpointer data)
 {
     if (signal == SIGUSR1) {
-       fprintf(stderr, "Caught signal %d. Restarting.\n", signal);
+        ob_debug("Caught signal %d. Restarting.\n", signal);
         ob_restart();
     } else if (signal == SIGUSR2) {
-       fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal);
+        ob_debug("Caught signal %d. Reconfiguring.\n", signal);
         ob_reconfigure();
     } else {
-       fprintf(stderr, "Caught signal %d. Exiting.\n", signal);
+        ob_debug("Caught signal %d. Exiting.\n", signal);
         /* TERM and INT return a 0 code */
         ob_exit(!(signal == SIGTERM || signal == SIGINT));
     }
@@ -367,9 +367,9 @@ static void print_help()
     g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT);
 }
 
-static void parse_args(int argc, char **argv)
+static void parse_args(gint argc, gchar **argv)
 {
-    int i;
+    gint i;
 
     for (i = 1; i < argc; ++i) {
         if (!strcmp(argv[i], "--version")) {