X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=052929a5b5f9df36f93c8e400d3d27225e76a528;hb=071b5ee301bc847d95b1ae7b5bd6c2c4d225955d;hp=dac9d2224378354f9e2f48d2072cc2d74ba0050c;hpb=04010ff0fe1851fe296db8032cff7eccee2afb03;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index dac9d222..052929a5 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -21,6 +21,7 @@
 #include "openbox.h"
 #include "session.h"
 #include "dock.h"
+#include "modkeys.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -111,7 +112,7 @@ gint main(gint argc, gchar **argv)
     g_set_prgname(argv[0]);
 
     if (chdir(g_get_home_dir()) == -1)
-        g_message(_("Unable to change to home directory (%s): %s"),
+        g_message(_("Unable to change to home directory '%s': %s"),
                   g_get_home_dir(), g_strerror(errno));
      
     /* parse out command line args */
@@ -215,6 +216,8 @@ gint main(gint argc, gchar **argv)
                 xmlDocPtr doc;
                 xmlNodePtr node;
 
+                modkeys_startup(reconfigure);
+
                 /* startup the parsing so everything can register sections
                    of the rc */
                 i = parse_startup();
@@ -241,7 +244,8 @@ gint main(gint argc, gchar **argv)
                                         config_font_activewindow,
                                         config_font_inactivewindow,
                                         config_font_menutitle,
-                                        config_font_menuitem)))
+                                        config_font_menuitem,
+                                        config_font_osd)))
                 {
                     RrThemeFree(ob_rr_theme);
                     ob_rr_theme = theme;
@@ -319,6 +323,7 @@ gint main(gint argc, gchar **argv)
             window_shutdown(reconfigure);
             event_shutdown(reconfigure);
             config_shutdown();
+            modkeys_shutdown(reconfigure);
         } while (reconfigure);
     }