diff -Nru nautilus-3.2.0/debian/changelog nautilus-3.2.0/debian/changelog --- nautilus-3.2.0/debian/changelog 2011-09-27 01:24:14.000000000 -0500 +++ nautilus-3.2.0/debian/changelog 2011-09-28 23:21:52.000000000 -0500 @@ -1,3 +1,9 @@ +nautilus (1:3.2.0-0ubuntu3~ppa4) oneiric; urgency=low + + * debian/patches/05_desktop_menu_export.patch: Update for Nautilus 3.x + + -- Ted Gould Wed, 28 Sep 2011 23:21:33 -0500 + nautilus (1:3.2.0-0ubuntu2) oneiric; urgency=low * debian/control.in: Bump libglib2.0-dev build dependency to ensure that we diff -Nru nautilus-3.2.0/debian/patches/05_desktop_menu_export.patch nautilus-3.2.0/debian/patches/05_desktop_menu_export.patch --- nautilus-3.2.0/debian/patches/05_desktop_menu_export.patch 2011-09-27 01:24:14.000000000 -0500 +++ nautilus-3.2.0/debian/patches/05_desktop_menu_export.patch 2011-09-28 23:21:32.000000000 -0500 @@ -1,6 +1,11 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL === modified file 'libnautilus-private/nautilus-ui-utilities.c' ---- old/libnautilus-private/nautilus-ui-utilities.c 2009-12-14 13:52:15 +0000 -+++ new/libnautilus-private/nautilus-ui-utilities.c 2011-04-08 19:29:19 +0000 +Index: nautilus-3.2.0/libnautilus-private/nautilus-ui-utilities.c +=================================================================== +--- nautilus-3.2.0.orig/libnautilus-private/nautilus-ui-utilities.c 2011-09-12 18:14:31.000000000 -0500 ++++ nautilus-3.2.0/libnautilus-private/nautilus-ui-utilities.c 2011-09-28 23:21:01.378559152 -0500 @@ -97,8 +97,11 @@ path = nautilus_ui_file (filename); if (path == NULL || !g_file_get_contents (path, &ui, NULL, NULL)) { @@ -13,35 +18,23 @@ g_hash_table_insert (ui_cache, g_strdup (filename), ui); - -=== modified file 'src/Makefile.am' ---- old/src/Makefile.am 2010-08-12 16:41:04 +0000 -+++ new/src/Makefile.am 2011-03-28 16:49:41 +0000 -@@ -173,6 +173,7 @@ - nautilus-shell-ui.xml \ - nautilus-navigation-window-ui.xml \ - nautilus-spatial-window-ui.xml \ -+ nautilus-desktop-window-ui.xml \ +Index: nautilus-3.2.0/src/Makefile.am +=================================================================== +--- nautilus-3.2.0.orig/src/Makefile.am 2011-09-28 23:21:00.718542796 -0500 ++++ nautilus-3.2.0/src/Makefile.am 2011-09-28 23:21:01.378559152 -0500 +@@ -179,6 +179,7 @@ nautilus-file-management-properties.ui \ nautilus-bookmarks-window.ui \ - $(NULL) - -=== modified file 'src/Makefile.in' ---- old/src/Makefile.in 2011-01-03 17:22:00 +0000 -+++ new/src/Makefile.in 2011-03-28 16:49:49 +0000 -@@ -599,6 +599,7 @@ - nautilus-shell-ui.xml \ - nautilus-navigation-window-ui.xml \ - nautilus-spatial-window-ui.xml \ -+ nautilus-desktop-window-ui.xml \ - nautilus-file-management-properties.ui \ - nautilus-bookmarks-window.ui \ - $(NULL) - -=== modified file 'src/file-manager/fm-desktop-icon-view.c' ---- old/src/file-manager/fm-desktop-icon-view.c 2010-09-28 01:18:38 +0000 -+++ new/src/file-manager/fm-desktop-icon-view.c 2011-03-28 21:55:20 +0000 -@@ -769,6 +769,15 @@ + nautilus-desktop-icon-view-ui.xml \ ++ nautilus-desktop-window-ui.xml \ + nautilus-directory-view-ui.xml \ + nautilus-icon-view-ui.xml \ + nautilus-list-view-ui.xml \ +Index: nautilus-3.2.0/src/nautilus-desktop-icon-view.c +=================================================================== +--- nautilus-3.2.0.orig/src/nautilus-desktop-icon-view.c 2011-09-28 23:21:01.322557763 -0500 ++++ nautilus-3.2.0/src/nautilus-desktop-icon-view.c 2011-09-28 23:21:01.378559152 -0500 +@@ -830,6 +830,15 @@ ui = nautilus_ui_string_get ("nautilus-desktop-icon-view-ui.xml"); desktop_view->details->desktop_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); @@ -56,11 +49,11 @@ + } } - static gboolean - -=== added file 'src/nautilus-desktop-window-ui.xml' ---- old/src/nautilus-desktop-window-ui.xml 1970-01-01 00:00:00 +0000 -+++ new/src/nautilus-desktop-window-ui.xml 2011-03-28 19:15:58 +0000 + static NautilusView * +Index: nautilus-3.2.0/src/nautilus-desktop-window-ui.xml +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ nautilus-3.2.0/src/nautilus-desktop-window-ui.xml 2011-09-28 23:21:01.382559252 -0500 @@ -0,0 +1,14 @@ + + @@ -76,20 +69,20 @@ + + + - -=== modified file 'src/nautilus-desktop-window.c' ---- old/src/nautilus-desktop-window.c 2010-08-12 16:41:04 +0000 -+++ new/src/nautilus-desktop-window.c 2011-04-08 19:32:26 +0000 -@@ -34,6 +34,7 @@ - #include +Index: nautilus-3.2.0/src/nautilus-desktop-window.c +=================================================================== +--- nautilus-3.2.0.orig/src/nautilus-desktop-window.c 2011-09-12 20:14:23.000000000 -0500 ++++ nautilus-3.2.0/src/nautilus-desktop-window.c 2011-09-28 23:21:01.382559252 -0500 +@@ -37,6 +37,7 @@ #include #include + #include +#include - #include - #include -@@ -41,6 +42,29 @@ - int dummy; + struct NautilusDesktopWindowDetails { + gulong size_changed_id; +@@ -44,6 +45,31 @@ + gboolean loaded; }; +static void @@ -115,122 +108,176 @@ + G_CALLBACK(ubuntu_docs_cb)} +}; + - static void set_wmspec_desktop_hint (GdkWindow *window); - - G_DEFINE_TYPE (NautilusDesktopWindow, nautilus_desktop_window, -@@ -68,11 +92,77 @@ - gtk_widget_hide (NAUTILUS_WINDOW (window)->details->statusbar); - gtk_widget_hide (NAUTILUS_WINDOW (window)->details->menubar); - -+ UbuntuMenuProxy * proxy = ubuntu_menu_proxy_get(); -+ if (proxy != NULL) { -+ ubuntu_menu_proxy_insert(proxy, GTK_WIDGET(window), NAUTILUS_WINDOW(window)->details->menubar, 0); -+ } ++static void set_wmspec_desktop_hint (GdkWindow *window); + - /* Don't allow close action on desktop */ - action = gtk_action_group_get_action (NAUTILUS_WINDOW (window)->details->main_action_group, + G_DEFINE_TYPE (NautilusDesktopWindow, nautilus_desktop_window, + NAUTILUS_TYPE_WINDOW); + +@@ -76,6 +102,120 @@ NAUTILUS_ACTION_CLOSE); gtk_action_set_sensitive (action, FALSE); -+ /* Add actions for the desktop */ -+ GtkActionGroup * desktop_agroup = gtk_action_group_new("DesktopActions"); -+ gtk_action_group_set_translation_domain(desktop_agroup, GETTEXT_PACKAGE); -+ gtk_action_group_add_actions(desktop_agroup, desktop_entries, G_N_ELEMENTS(desktop_entries), window); -+ gtk_ui_manager_insert_action_group(nautilus_window_get_ui_manager(NAUTILUS_WINDOW(window)), -+ desktop_agroup, 0); -+ g_object_unref(desktop_agroup); -+ -+ GtkUIManager * ui_manager = nautilus_window_get_ui_manager(NAUTILUS_WINDOW(window)); -+ const gchar * ui = nautilus_ui_string_get ("nautilus-desktop-window-ui.xml"); -+ if (ui != NULL) { -+ gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); -+ } -+ -+ /* Hide actions that don't make sense on the desktop */ -+ GList * agroups = gtk_ui_manager_get_action_groups(NAUTILUS_WINDOW(window)->details->ui_manager); -+ while (agroups != NULL) { -+ GtkActionGroup * agroup = GTK_ACTION_GROUP(agroups->data); -+ const gchar * name = gtk_action_group_get_name(agroup); -+ -+ if (g_strcmp0(name, "LaunchpadIntegration") == 0) { -+ gtk_action_group_set_visible(agroup, FALSE); -+ } else if (g_strcmp0(name, "SpatialActions") == 0) { -+ GtkAction * action = NULL; -+ -+ action = gtk_action_group_get_action(agroup, "Close Parent Folders"); -+ gtk_action_set_visible(action, FALSE); -+ -+ action = gtk_action_group_get_action(agroup, "Close All Folders"); -+ gtk_action_set_visible(action, FALSE); -+ } else if (g_strcmp0(name, "ShellActions") == 0) { -+ GtkAction * action = NULL; -+ -+ action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_CLOSE); -+ gtk_action_set_visible(action, FALSE); -+ -+ action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_STOP); -+ gtk_action_set_visible(action, FALSE); -+ -+ action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_RELOAD); -+ gtk_action_set_visible(action, FALSE); -+ -+ action = gtk_action_group_get_action(agroup, "Backgrounds and Emblems"); -+ gtk_action_set_visible(action, FALSE); ++ gtk_widget_hide (NAUTILUS_WINDOW (window)->details->statusbar); ++ gtk_widget_hide (NAUTILUS_WINDOW (window)->details->menubar); + -+ action = gtk_action_group_get_action(agroup, "Preferences"); -+ gtk_action_set_visible(action, FALSE); -+ -+ action = gtk_action_group_get_action(agroup, "Nautilus Manual"); -+ gtk_action_set_visible(action, FALSE); -+ -+ action = gtk_action_group_get_action(agroup, "About Nautilus"); -+ gtk_action_set_visible(action, FALSE); -+ -+ action = gtk_action_group_get_action(agroup, "Up"); -+ gtk_action_set_visible(action, FALSE); -+ } -+ -+ agroups = g_list_next(agroups); -+ } ++ UbuntuMenuProxy * proxy = ubuntu_menu_proxy_get(); ++ if (proxy != NULL) { ++ ubuntu_menu_proxy_insert(proxy, GTK_WIDGET(window), NAUTILUS_WINDOW(window)->details->menubar, 0); ++ } ++ ++ action = NULL; ++ /* Don't allow close action on desktop */ ++ action = gtk_action_group_get_action (NAUTILUS_WINDOW (window)->details->main_action_group, ++ NAUTILUS_ACTION_CLOSE); ++ gtk_action_set_sensitive (action, FALSE); ++ ++ /* Add actions for the desktop */ ++ GtkActionGroup * desktop_agroup = gtk_action_group_new("DesktopActions"); ++ gtk_action_group_set_translation_domain(desktop_agroup, GETTEXT_PACKAGE); ++ gtk_action_group_add_actions(desktop_agroup, desktop_entries, G_N_ELEMENTS(desktop_entries), window); ++ gtk_ui_manager_insert_action_group(nautilus_window_get_ui_manager(NAUTILUS_WINDOW(window)), ++ desktop_agroup, 0); ++ g_object_unref(desktop_agroup); ++ ++ GtkUIManager * ui_manager = nautilus_window_get_ui_manager(NAUTILUS_WINDOW(window)); ++ const gchar * ui = nautilus_ui_string_get ("nautilus-desktop-window-ui.xml"); ++ if (ui != NULL) { ++ gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); ++ } ++ ++ /* Hide actions that don't make sense on the desktop */ ++ GList * agroups = gtk_ui_manager_get_action_groups(NAUTILUS_WINDOW(window)->details->ui_manager); ++ while (agroups != NULL) { ++ GtkActionGroup * agroup = GTK_ACTION_GROUP(agroups->data); ++ const gchar * name = gtk_action_group_get_name(agroup); ++ ++ if (g_strcmp0(name, "LaunchpadIntegration") == 0) { ++ gtk_action_group_set_visible(agroup, FALSE); ++ } else if (g_strcmp0(name, "SpatialActions") == 0) { ++ GtkAction * action = NULL; ++ ++ action = gtk_action_group_get_action(agroup, "Close Parent Folders"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Close All Folders"); ++ gtk_action_set_visible(action, FALSE); ++ } else if (g_strcmp0(name, "ShellActions") == 0) { ++ GtkAction * action = NULL; ++ ++ action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_CLOSE); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_STOP); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_RELOAD); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Backgrounds and Emblems"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Preferences"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Nautilus Manual"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "About Nautilus"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Up"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "New Tab"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "New Tab"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_SHOW_HIDE_EXTRA_PANE); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Show Hide Sidebar"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Show Hide Statusbar"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Show Hide Toolbar"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Sidebar Places"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "Sidebar Tree"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "NautilusHelp"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "NautilusHelpSearch"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "NautilusHelpSort"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "NautilusHelpLost"); ++ gtk_action_set_visible(action, FALSE); ++ ++ action = gtk_action_group_get_action(agroup, "NautilusHelpShare"); ++ gtk_action_set_visible(action, FALSE); ++ } ++ ++ agroups = g_list_next(agroups); ++ } + /* Set the accessible name so that it doesn't inherit the cryptic desktop URI. */ accessible = gtk_widget_get_accessible (GTK_WIDGET (window)); - if (accessible) - -=== modified file 'src/nautilus-shell-ui.xml' ---- old/src/nautilus-shell-ui.xml 2010-01-06 17:14:33 +0000 -+++ new/src/nautilus-shell-ui.xml 2011-03-28 16:40:10 +0000 -@@ -39,6 +39,8 @@ + +@@ -106,6 +246,8 @@ + + g_object_set_data (G_OBJECT (window), "is_desktop_window", + GINT_TO_POINTER (1)); ++ ++ + } + + static gint +Index: nautilus-3.2.0/src/nautilus-shell-ui.xml +=================================================================== +--- nautilus-3.2.0.orig/src/nautilus-shell-ui.xml 2011-09-28 23:21:01.302557268 -0500 ++++ nautilus-3.2.0/src/nautilus-shell-ui.xml 2011-09-28 23:21:01.382559252 -0500 +@@ -49,6 +49,8 @@ + - + + -@@ -66,6 +68,8 @@ - - +@@ -116,6 +118,8 @@ + + + + - -=== modified file 'src/nautilus-window.c' ---- old/src/nautilus-window.c 2010-08-12 16:41:04 +0000 -+++ new/src/nautilus-window.c 2011-03-21 21:55:41 +0000 -@@ -42,6 +42,7 @@ - #include "nautilus-zoom-control.h" - #include "nautilus-search-bar.h" - #include "nautilus-navigation-window-pane.h" +Index: nautilus-3.2.0/src/nautilus-window.c +=================================================================== +--- nautilus-3.2.0.orig/src/nautilus-window.c 2011-09-21 13:11:33.000000000 -0500 ++++ nautilus-3.2.0/src/nautilus-window.c 2011-09-28 23:21:01.386559351 -0500 +@@ -37,6 +37,7 @@ + #include "nautilus-location-bar.h" + #include "nautilus-mime-actions.h" + #include "nautilus-notebook.h" +#include "nautilus-desktop-window.h" - #include - #include - #include -@@ -1066,6 +1067,10 @@ + #include "nautilus-places-sidebar.h" + #include "nautilus-search-bar.h" + #include "nautilus-tree-sidebar.h" +@@ -1215,6 +1216,10 @@ window->details->view_as_radio_action = action; } @@ -241,4 +288,15 @@ data = g_slice_new (ActivateViewData); data->window = window; data->id = g_strdup (identifier); - +Index: nautilus-3.2.0/src/Makefile.in +=================================================================== +--- nautilus-3.2.0.orig/src/Makefile.in 2011-09-28 23:21:31.327301432 -0500 ++++ nautilus-3.2.0/src/Makefile.in 2011-09-28 23:21:27.963218044 -0500 +@@ -551,6 +551,7 @@ + nautilus-file-management-properties.ui \ + nautilus-bookmarks-window.ui \ + nautilus-desktop-icon-view-ui.xml \ ++ nautilus-desktop-window-ui.xml \ + nautilus-directory-view-ui.xml \ + nautilus-icon-view-ui.xml \ + nautilus-list-view-ui.xml \ diff -Nru nautilus-3.2.0/debian/patches/series nautilus-3.2.0/debian/patches/series --- nautilus-3.2.0/debian/patches/series 2011-09-27 01:24:14.000000000 -0500 +++ nautilus-3.2.0/debian/patches/series 2011-09-28 23:20:39.000000000 -0500 @@ -2,7 +2,7 @@ 02_additional_marge_for_unity.patch 03_translations_list_update.patch 04_suppress_umount_in_ltsp.patch -#05_desktop_menu_export.patch +05_desktop_menu_export.patch 06_never_exec_nonexec_launchers.patch 07_use_application_indicator.patch 08_clean_session_capplet.patch