Attached a patch that fixes the support for submenus in Nautilus Extensions. Without the patch the situation is: * It is possible to create submenus, but no action is activated. They are shown only when at least one file/folder is selected. * It is not possible to create submenus when the menu is invoked on the background of the folder. This patch fixes this two issues and also makes happy to Python developers who now will see their submenus working properly in their extensions :-) It was filed under http://bugzilla.gnome.org/show_bug.cgi?id=508878 where you can find screenshots and a extension's test case to show the problem. The patch is against the stable release. I can cook another for trunk if this is accepted :-) Regards, -- Germán Póo-Caamaño Concepción - Chile http://www.calcifer.org/
Index: src/nautilus-window-menus.c
===================================================================
--- src/nautilus-window-menus.c (revision 14213)
+++ src/nautilus-window-menus.c (working copy)
@@ -774,15 +774,77 @@
return items;
}
+static void
+add_extension_menu_items (NautilusWindow *window,
+ guint merge_id,
+ GtkActionGroup *action_group,
+ GList *menu_items,
+ const char *subdirectory)
+{
+ GtkUIManager *ui_manager;
+ GList *l;
+
+ ui_manager = window->details->ui_manager;
+
+ for (l = menu_items; l; l = l->next) {
+ NautilusMenuItem *item;
+ NautilusMenu *menu;
+ GtkAction *action;
+ char *path;
+
+ item = NAUTILUS_MENU_ITEM (l->data);
+
+ g_object_get (item, "menu", &menu, NULL);
+
+ action = nautilus_action_from_menu_item (item);
+ gtk_action_group_add_action (action_group, action);
+
+ path = g_build_path ("/", POPUP_PATH_EXTENSION_ACTIONS, subdirectory, NULL);
+ gtk_ui_manager_add_ui (ui_manager,
+ merge_id,
+ path,
+ gtk_action_get_name (action),
+ gtk_action_get_name (action),
+ (menu != NULL) ? GTK_UI_MANAGER_MENU : GTK_UI_MANAGER_MENUITEM,
+ FALSE);
+ g_free (path);
+
+ path = g_build_path ("/", MENU_PATH_EXTENSION_ACTIONS, subdirectory, NULL);
+ gtk_ui_manager_add_ui (ui_manager,
+ merge_id,
+ path,
+ gtk_action_get_name (action),
+ gtk_action_get_name (action),
+ (menu != NULL) ? GTK_UI_MANAGER_MENU : GTK_UI_MANAGER_MENUITEM,
+ FALSE);
+ g_free (path);
+
+ /* recursively fill the menu */
+ if (menu != NULL) {
+ char *subdir;
+ GList *children;
+
+ children = nautilus_menu_get_items (menu);
+
+ subdir = g_build_path ("/", subdirectory, gtk_action_get_name (action), NULL);
+ add_extension_menu_items (window,
+ merge_id,
+ action_group,
+ children,
+ subdir);
+
+ nautilus_menu_item_list_free (children);
+ g_free (subdir);
+ }
+ }
+}
+
void
nautilus_window_load_extension_menus (NautilusWindow *window)
{
- NautilusMenuItem *item;
GtkActionGroup *action_group;
- GtkAction *action;
GList *items;
GList *l;
- int i;
guint merge_id;
if (window->details->extensions_menu_merge_id != 0) {
@@ -807,35 +869,15 @@
items = get_extension_menus (window);
- for (l = items, i = 0; l != NULL; l = l->next, i++) {
- item = NAUTILUS_MENU_ITEM (l->data);
+ if (items != NULL) {
+ add_extension_menu_items (window, merge_id, action_group, items, "");
- action = nautilus_action_from_menu_item (item);
- gtk_action_group_add_action (action_group,
- GTK_ACTION (action));
- g_object_unref (action);
-
- gtk_ui_manager_add_ui (window->details->ui_manager,
- merge_id,
- MENU_PATH_EXTENSION_ACTIONS,
- gtk_action_get_name (action),
- gtk_action_get_name (action),
- GTK_UI_MANAGER_MENUITEM,
- FALSE);
+ for (l = items; l != NULL; l = l->next) {
+ g_object_unref (l->data);
+ }
- gtk_ui_manager_add_ui (window->details->ui_manager,
- merge_id,
- POPUP_PATH_EXTENSION_ACTIONS,
- gtk_action_get_name (action),
- gtk_action_get_name (action),
- GTK_UI_MANAGER_MENUITEM,
- FALSE);
-
-
- g_object_unref (item);
+ g_list_free (items);
}
-
- g_list_free (items);
}
Index: src/file-manager/fm-directory-view.c
===================================================================
--- src/file-manager/fm-directory-view.c (revision 14213)
+++ src/file-manager/fm-directory-view.c (working copy)
@@ -4425,7 +4425,7 @@
GList* submenus;
submenus = nautilus_menu_get_items (menu);
- ret = search_in_menu_items (submenus, name);
+ ret = search_in_menu_items (submenus, item_name);
nautilus_menu_item_list_free (submenus);
g_object_unref (menu);
if (ret) {
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14213)
+++ ChangeLog (working copy)
@@ -1,3 +1,14 @@
+2008-06-08 German Poo-Caamano <gpoo gnome org>
+
+ * src/nautilus-window-menus.c:
+ (add_extension_menu_items): New function to fill submenus from
+ extensions using NautilusMenuProvider::get_background_items.
+ (nautilus_window_load_extension_menus): Fixed submenu support
+ for extensions using NautilusMenuProvider::get_background_items.
+ * src/file-manager/fm-directory-view.c:
+ (search_in_menu_items): Fix typo. Submenus provided by
+ extensions were not activated (#508878).
+
2008-05-29 Christian Neumair <cneumair gnome org>
* configure.in:
Attachment:
signature.asc
Description: This is a digitally signed message part