Fix up tests now that operator= on ScopedConnection disconnects the old connection...

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

diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index 774991038e64a6b92f969e5566b657f39c2b94e0..74533f96a4b087393164fcfbeeb857fdb707a00c 100644 (file)
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -246,13 +246,33 @@ ActionManager::get_widget (const char * name)
 RefPtr<Action>
 ActionManager::get_action (const char* path)
 {
-       char copy[strlen(path)+1];
+       if (!path) {
+               return RefPtr<Action>();
+       }
+
+       /* Skip <Actions>/ in path */
+
+       int len = strlen (path);
+
+       if (len < 3) {
+               /* shortest possible path: "a/b" */
+               return RefPtr<Action>();
+       }
+
+       if (len > 10 && !strncmp (path, "<Actions>/", 10 )) {
+               path = path+10;
+       } else if (path[0] == '/') {
+               path++;
+       }
+
+       char copy[len+1];
        strcpy (copy, path);
-       char *slash = strchr (copy, '/');
+       char* slash = strchr (copy, '/');
        if (!slash) {
                return RefPtr<Action> ();
        }
        *slash = '\0';
+
        return get_action (copy, ++slash);
        
 }
@@ -290,6 +310,32 @@ ActionManager::get_action (const char* group_name, const char* action_name)
        return act;
 }
 
+RefPtr<Action>
+ActionManager::get_action_from_name (const char* name)
+{
+       /* the C++ API for functions used here appears to be broken in
+          gtkmm2.6, so we fall back to the C level.
+       */
+
+       GList* list = gtk_ui_manager_get_action_groups (ui_manager->gobj());
+       GList* node;
+       GList* acts;
+
+       for (node = list; node; node = g_list_next (node)) {
+
+               GtkActionGroup* group = (GtkActionGroup*) node->data;
+
+               for (acts = gtk_action_group_list_actions (group); acts; acts = g_list_next (acts)) {
+                       GtkAction* action = (GtkAction*) acts->data;
+                       if (!strcmp (gtk_action_get_name (action), name)) {
+                               return Glib::wrap (action, true);
+                       }
+               }
+       }
+
+       return RefPtr<Action>();
+}
+
 void
 ActionManager::set_sensitive (vector<RefPtr<Action> >& actions, bool state)
 {