ob_remote has been killed, remove ob_sync from the public header, its only used internally
Dana Jansens danakj@orodu.net
2 files changed,
3 insertions(+),
8 deletions(-)
M
openbox/openbox.c
→
openbox/openbox.c
@@ -61,10 +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]; +static gboolean sync; static gboolean shutdown; static gboolean restart; static char *restart_path;@@ -155,7 +155,7 @@ exit_with_error("Failed to initialize the render library.");
/* XXX fork self onto other screens */ - XSynchronize(ob_display, ob_sync); + XSynchronize(ob_display, sync); /* check for locale support */ if (!XSupportsLocale())@@ -526,7 +526,7 @@ } else if (!strcmp(argv[i], "--help")) {
print_help(); exit(0); } else if (!strcmp(argv[i], "--sync")) { - ob_sync = TRUE; + sync = TRUE; #ifdef USE_SM } else if (!strcmp(argv[i], "--sm-client-id")) { if (i == argc - 1) /* no args left */
M
openbox/openbox.h
→
openbox/openbox.h
@@ -32,11 +32,6 @@
/* The state of execution of the window manager */ extern ObState ob_state; -/*! Runtime option to specify running on a remote display */ -extern gboolean ob_remote; -/*! Runtime option to run in synchronous mode */ -extern gboolean ob_sync; - void ob_restart_other(const gchar *path); void ob_restart(); void ob_exit();