Update classkeys to match new total LuaSignal count (windows only)

[ardour.git] / libs / gtkmm2ext / actions.cc

diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index 7eda4df542b76be6b2c739c3fd779a7ae624143c..76c6ba043b7e6b212315416a145fcaf19d0b68be 100644 (file)
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -41,7 +41,7 @@
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -167,7 +167,7 @@ ActionManager::get_action (const char* group_name, const char* action_name)
           gtkmm2.6, so we fall back to the C level.
        */
 
-       if (ui_manager == 0) {
+       if (! ui_manager) {
                return RefPtr<Action> ();
        }
 
@@ -187,6 +187,8 @@ ActionManager::get_action (const char* group_name, const char* action_name)
                                act = Glib::wrap (_act, true);
                                break;
                        }
+
+                       break;
                }
        }
 
@@ -218,19 +220,19 @@ ActionManager::set_sensitive (vector<RefPtr<Action> >& actions, bool state)
 }
 
 void
-ActionManager::check_toggleaction (string n)
+ActionManager::check_toggleaction (const string& n)
 {
        set_toggleaction_state (n, true);
 }
 
 void
-ActionManager::uncheck_toggleaction (string n)
+ActionManager::uncheck_toggleaction (const string& n)
 {
        set_toggleaction_state (n, false);
 }
 
 void
-ActionManager::set_toggleaction_state (string n, bool s)
+ActionManager::set_toggleaction_state (const string& n, bool s)
 {
        char const * name = n.c_str ();
 
@@ -250,16 +252,25 @@ ActionManager::set_toggleaction_state (string n, bool s)
        group_name[len] = '\0';
 
        const char* action_name = last_slash + 1;
+       if (!set_toggleaction_state (group_name, action_name, s)) {
+               error << string_compose (_("Unknown action name: %1/%2"), group_name, action_name) << endmsg;
+       }
+
+       delete [] group_name;
+}
 
+bool
+ActionManager::set_toggleaction_state (const char* group_name, const char* action_name, bool s)
+{
        RefPtr<Action> act = get_action (group_name, action_name);
        if (act) {
                RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
-               tact->set_active (s);
-       } else {
-               error << string_compose (_("Unknown action name: %1"),  name) << endmsg;
+               if (tact) {
+                       tact->set_active (s);
+                       return true;
+               }
        }
-
-       delete [] group_name;
+       return false;
 }
 
 void
@@ -282,4 +293,3 @@ ActionManager::set_toggle_action (const char* group, const char*action, bool yn)
                }
        }
 }
-