reverse that last commit.. that was by accident..

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 3f764f2b639e671970463a702fdb9c1d5cd31670..7d2efd6e5b98510966397048398e3ab813d6b5c2 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    openbox.c for the Openbox window manager
-   Copyright (c) 2004        Mikael Magnusson
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -76,16 +76,17 @@ RrTheme    *ob_rr_theme;
 ObMainLoop *ob_main_loop;
 Display    *ob_display;
 gint        ob_screen;
-gboolean    ob_replace_wm;
+gboolean    ob_replace_wm = FALSE;
 
 static ObState   state;
-static gboolean  xsync;
-static gboolean  reconfigure;
-static gboolean  restart;
-static gchar    *restart_path;
+static gboolean  xsync = FALSE;
+static gboolean  reconfigure = FALSE;
+static gboolean  restart = FALSE;
+static gchar    *restart_path = NULL;
 static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
 static gint      exitcode = 0;
+static gboolean  reconfigure_and_exit = FALSE;
 
 static void signal_handler(gint signal, gpointer data);
 static void parse_args(gint argc, gchar **argv);
@@ -326,7 +327,8 @@ gint main(gint argc, gchar **argv)
 
         /* re-run me */
         execvp(argv[0], argv); /* try how we were run */
-        execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */
+        execlp(argv[0], g_path_get_basename(argv[0]),
+               (char *)NULL); /* last resort */
     }
      
     return exitcode;
@@ -357,8 +359,8 @@ static void signal_handler(gint signal, gpointer data)
 static void print_version()
 {
     g_print("Openbox %s\n", PACKAGE_VERSION);
-    g_print("Copyright (c) 2004 Mikael Magnusson, and others\n");
-    g_print("Copyright (c) 2003 Ben Jansens, and others\n\n");
+    g_print("Copyright (c) 2006 Mikael Magnusson\n");
+    g_print("Copyright (c) 2003 Ben Jansens\n\n");
     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
     g_print("This is free software, and you are welcome to redistribute it\n");
     g_print("under certain conditions. See the file COPYING for details.\n\n");