X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=cb36eba123ba6fcb7ee5ea6f9efc5ad0bc23c125;hb=a46b4ee4341dcf5c86b9182b5b970825f2e11692;hp=d39e0cfce6d2f7f9fb79a3fbf5822d6a58d51c86;hpb=eea43e64883fc0c988b916db99bc5b45ccffc432;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index d39e0cfc..cb36eba1 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -61,11 +61,10 @@ Display *ob_display; int ob_screen; Window ob_root; ObState ob_state; -gboolean ob_sync; Cursor ob_cursors[OB_NUM_CURSORS]; KeyCode ob_keys[OB_NUM_KEYS]; -char *ob_rc_path; +static gboolean sync; static gboolean shutdown; static gboolean restart; static char *restart_path; @@ -156,7 +155,7 @@ int main(int argc, char **argv) /* XXX fork self onto other screens */ - XSynchronize(ob_display, ob_sync); + XSynchronize(ob_display, sync); /* check for locale support */ if (!XSupportsLocale()) @@ -504,7 +503,6 @@ static void print_help() print_version(); g_print("Syntax: openbox [options]\n\n"); g_print("Options:\n\n"); - g_print(" --rc PATH Specify the path to the rc file to use\n"); #ifdef USE_SM g_print(" --sm-client-id ID Specify session management ID\n"); g_print(" --sm-disable Disable connection to session manager\n"); @@ -528,12 +526,7 @@ static void parse_args(int argc, char **argv) print_help(); exit(0); } else if (!strcmp(argv[i], "--sync")) { - ob_sync = TRUE; - } else if (!strcmp(argv[i], "--rc")) { - if (i == argc - 1) /* no args left */ - g_printerr(_("--rc requires an argument\n")); - else - ob_rc_path = argv[++i]; + sync = TRUE; #ifdef USE_SM } else if (!strcmp(argv[i], "--sm-client-id")) { if (i == argc - 1) /* no args left */