X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=4a49c8021086153ea43602024f15dbf190a324e3;hb=f34b2571b99f40885548fc3ea7c8c5b45ba64335;hp=43549280b74979085ce85ea39524f282c3c06503;hpb=14f4a0ba56b5e9619c9d9e65c0a3ede41595276e;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 43549280..4a49c802 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -85,7 +85,6 @@ #include #include - RrInstance *ob_rr_inst; RrImageCache *ob_rr_icons; RrTheme *ob_rr_theme; @@ -148,7 +147,6 @@ gint main(gint argc, gchar **argv) session_startup(argc, argv); } - ob_display = XOpenDisplay(NULL); if (ob_display == NULL) ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable.")); @@ -223,12 +221,13 @@ gint main(gint argc, gchar **argv) cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner", XC_top_left_corner); - prop_startup(); /* get atoms values for the display */ extensions_query_all(); /* find which extensions are present */ if (screen_annex()) { /* it will be ours! */ do { + ObPrompt *xmlprompt = NULL; + modkeys_startup(reconfigure); /* get the keycodes for keys we use */ @@ -376,7 +375,8 @@ gint main(gint argc, gchar **argv) gchar *m; m = g_strdup_printf(_("One or more XML syntax errors were found while parsing the Openbox configuration files. See stdout for more information. The last error seen was in file \"%s\" line %d, with message: %s"), e->file, e->line, e->message); - prompt_show_message(m, _("Close")); + xmlprompt = + prompt_show_message(m, _("Openbox Syntax Error"), _("Close")); g_free(m); xmlResetError(e); } @@ -386,6 +386,11 @@ gint main(gint argc, gchar **argv) ob_set_state(reconfigure ? OB_STATE_RECONFIGURING : OB_STATE_EXITING); + if (xmlprompt) { + prompt_unref(xmlprompt); + xmlprompt = NULL; + } + if (!reconfigure) { dock_remove_all(); client_unmanage_all();