add a menuOverlap property to themes, and use it in the submenu placement

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 40e3ef8b813b407ba4158b083c1721d1648cb485..234764178ea6df7bdd948c88feff242e42397a9a 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -63,7 +63,7 @@ Cursor      ob_cursors[OB_NUM_CURSORS];
 KeyCode     ob_keys[OB_NUM_KEYS];
 
 static ObState   state;
-static gboolean  sync;
+static gboolean  xsync;
 static gboolean  shutdown;
 static gboolean  restart;
 static char     *restart_path;
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
 
     /* XXX fork self onto other screens */
      
-    XSynchronize(ob_display, sync);
+    XSynchronize(ob_display, xsync);
 
     /* check for locale support */
     if (!XSupportsLocale())
@@ -243,7 +243,6 @@ int main(int argc, char **argv)
         if (ob_rr_theme == NULL)
             exit_with_error("Unable to load a theme.");
 
-        frame_startup();
         moveresize_startup();
        screen_startup();
         group_startup();
@@ -271,7 +270,6 @@ int main(int argc, char **argv)
        screen_shutdown();
        focus_shutdown();
         moveresize_shutdown();
-        frame_shutdown();
         menu_shutdown();
         window_shutdown();
         grab_shutdown();
@@ -523,8 +521,10 @@ static void parse_args(int argc, char **argv)
         } else if (!strcmp(argv[i], "--help")) {
             print_help();
             exit(0);
+        } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+            g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
         } else if (!strcmp(argv[i], "--sync")) {
-            sync = TRUE;
+            xsync = TRUE;
 #ifdef USE_SM
         } else if (!strcmp(argv[i], "--sm-client-id")) {
             if (i == argc - 1) /* no args left */