M src/Keys.hh → src/Keys.hh

@@ -75,8 +75,11 @@ void unregisterWindow(Window win);
 
     const std::string& filename() const { return m_filename; }
     /**
-       Reload configuration from filename
-       @return true on success, else false
+       Load configuration from file
+    */
+    void reload();
+    /**
+       Reload configuration if keys file has changed
     */
     void reconfigure();
     void keyMode(const std::string& keyMode);
@@ -94,10 +97,6 @@ void grabButton(unsigned int button, unsigned int mod, int context);
     void ungrabButtons();
     void grabWindow(Window win);
 
-    /**
-       Load configuration from file
-    */
-    void reload();
     // Load default keybindings for when there are errors loading the keys file
     void loadDefaults();
     void setKeyMode(t_key *keyMode);

M src/fluxbox.cc → src/fluxbox.cc

@@ -751,7 +751,7 @@ || e->xmapping.request == MappingModifier) {
             XRefreshKeyboardMapping(&e->xmapping);
             FbTk::KeyUtil::instance().init(); // reinitialise the key utils
             // reconfigure keys (if the mapping changes, they don't otherwise update
-            m_key->reconfigure();
+            m_key->reload();
         }
         break;
     case CreateNotify: