Nautilus

Merge lp:~mitya57/nautilus/ubuntu-fix-lp-880938 into lp:~ubuntu-desktop/nautilus/ubuntu

  1. ubuntu-fix-lp-880938
  2. Merge into ubuntu
Proposed by Dmitry Shachnev
Status: Merged
Merge reported by: Didier Roche-Tolomelli
Merged at revision: not available
Proposed branch: lp:~mitya57/nautilus/ubuntu-fix-lp-880938
Merge into: lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target: 162 lines (+32/-30)
2 files modified
debian/changelog (+13/-5)
debian/patches/05_desktop_menu_export.patch (+19/-25)
To merge this branch: bzr merge lp:~mitya57/nautilus/ubuntu-fix-lp-880938
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+81394@code.launchpad.net

Description of the change

revno: 202
fixes bug(s): https://launchpad.net/bugs/880938
committer: Dmitry Shachnev <email address hidden>
branch nick: ubuntu
timestamp: Sun 2011-11-06 14:55:06 +0400
message:
  debian/patches/05_desktop_menu_export.patch (updated):
  - Stop hiding actions that do not exist anymore (LP: #880938)

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks for your work there!
I've merged that in tweaking the files (the ubuntu3 was already uploaded in oneiric-proposed), but took your patch and credited you!

The fix will be in precise and oneiric-proposed shortly, thanks again for your work ;)

review: Approve
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks! I also have some thoughts on improving my previous code (related to bug 826771), but that's not urgent and I'll do it later.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-31 16:30:56 +0000
3+++ debian/changelog 2011-11-06 11:10:28 +0000
4@@ -2,6 +2,18 @@
5
6 [ Dmitry Shachnev ]
7 * debian/patches/05_desktop_menu_export.patch (updated):
8+ - Stop hiding actions that do not exist anymore (LP: #880938)
9+
10+ [ Didier Roche ]
11+ * debian/nautilus.links: provide a symlink to workaround missing desktop file
12+ from preferred mimeapps.list (LP: #876788)
13+
14+ -- Dmitry Shachnev <mitya57@gmail.com> Sun, 06 Nov 2011 14:51:26 +0400
15+
16+nautilus (1:3.2.1-0ubuntu2) oneiric-proposed; urgency=low
17+
18+ [ Dmitry Shachnev ]
19+ * debian/patches/05_desktop_menu_export.patch (updated):
20 - Destroy menubar on non-ubuntu sessions (LP: #826771)
21 - Remove duplicate lines (LP: #874847)
22 * debian/patches/17_dont_allow_new_tab_on_desktop.patch:
23@@ -11,11 +23,7 @@
24 * 05_desktop_menu_export.patch: Fix potential crash if $DESKTOP_SESSION is
25 not set.
26
27- [ Didier Roche ]
28- * debian/nautilus.links: provide a symlink to workaround missing desktop file
29- from prefered mimeapps.list (LP: #876788)
30-
31- -- Didier Roche <didrocks@ubuntu.com> Mon, 31 Oct 2011 12:28:50 -0400
32+ -- Dmitry Shachnev <mitya57@gmail.com> Tue, 25 Oct 2011 12:46:53 +0200
33
34 nautilus (1:3.2.1-0ubuntu1) oneiric-proposed; urgency=low
35
36
37=== modified file 'debian/patches/05_desktop_menu_export.patch'
38--- debian/patches/05_desktop_menu_export.patch 2011-10-25 10:42:37 +0000
39+++ debian/patches/05_desktop_menu_export.patch 2011-11-06 11:10:28 +0000
40@@ -4,8 +4,8 @@
41 === modified file 'libnautilus-private/nautilus-ui-utilities.c'
42 Index: nautilus-3.2.1/libnautilus-private/nautilus-ui-utilities.c
43 ===================================================================
44---- nautilus-3.2.1.orig/libnautilus-private/nautilus-ui-utilities.c 2011-09-13 01:14:31.000000000 +0200
45-+++ nautilus-3.2.1/libnautilus-private/nautilus-ui-utilities.c 2011-10-25 12:40:36.438828972 +0200
46+--- nautilus-3.2.1.orig/libnautilus-private/nautilus-ui-utilities.c 2011-09-13 03:14:31.000000000 +0400
47++++ nautilus-3.2.1/libnautilus-private/nautilus-ui-utilities.c 2011-11-06 14:39:06.012780214 +0400
48 @@ -97,8 +97,11 @@
49 path = nautilus_ui_file (filename);
50 if (path == NULL || !g_file_get_contents (path, &ui, NULL, NULL)) {
51@@ -20,8 +20,8 @@
52 ui);
53 Index: nautilus-3.2.1/src/Makefile.am
54 ===================================================================
55---- nautilus-3.2.1.orig/src/Makefile.am 2011-09-21 20:11:33.000000000 +0200
56-+++ nautilus-3.2.1/src/Makefile.am 2011-10-25 12:40:36.438828972 +0200
57+--- nautilus-3.2.1.orig/src/Makefile.am 2011-09-21 22:11:33.000000000 +0400
58++++ nautilus-3.2.1/src/Makefile.am 2011-11-06 14:39:06.012780214 +0400
59 @@ -179,6 +179,7 @@
60 nautilus-file-management-properties.ui \
61 nautilus-bookmarks-window.ui \
62@@ -32,8 +32,8 @@
63 nautilus-list-view-ui.xml \
64 Index: nautilus-3.2.1/src/nautilus-desktop-icon-view.c
65 ===================================================================
66---- nautilus-3.2.1.orig/src/nautilus-desktop-icon-view.c 2011-10-25 12:40:36.378828971 +0200
67-+++ nautilus-3.2.1/src/nautilus-desktop-icon-view.c 2011-10-25 12:40:36.438828972 +0200
68+--- nautilus-3.2.1.orig/src/nautilus-desktop-icon-view.c 2011-11-06 14:39:05.964779103 +0400
69++++ nautilus-3.2.1/src/nautilus-desktop-icon-view.c 2011-11-06 14:39:06.012780214 +0400
70 @@ -830,6 +830,15 @@
71 ui = nautilus_ui_string_get ("nautilus-desktop-icon-view-ui.xml");
72 desktop_view->details->desktop_merge_id =
73@@ -53,7 +53,7 @@
74 Index: nautilus-3.2.1/src/nautilus-desktop-window-ui.xml
75 ===================================================================
76 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
77-+++ nautilus-3.2.1/src/nautilus-desktop-window-ui.xml 2011-10-25 12:40:36.438828972 +0200
78++++ nautilus-3.2.1/src/nautilus-desktop-window-ui.xml 2011-11-06 14:39:06.012780214 +0400
79 @@ -0,0 +1,14 @@
80 +<ui>
81 +<menubar name="MenuBar">
82@@ -71,8 +71,8 @@
83 +</ui>
84 Index: nautilus-3.2.1/src/nautilus-desktop-window.c
85 ===================================================================
86---- nautilus-3.2.1.orig/src/nautilus-desktop-window.c 2011-09-13 03:14:23.000000000 +0200
87-+++ nautilus-3.2.1/src/nautilus-desktop-window.c 2011-10-25 12:41:55.966829522 +0200
88+--- nautilus-3.2.1.orig/src/nautilus-desktop-window.c 2011-09-13 05:14:23.000000000 +0400
89++++ nautilus-3.2.1/src/nautilus-desktop-window.c 2011-11-06 14:41:53.712657206 +0400
90 @@ -37,6 +37,7 @@
91 #include <libnautilus-private/nautilus-file-utilities.h>
92 #include <libnautilus-private/nautilus-icon-names.h>
93@@ -113,7 +113,7 @@
94 G_DEFINE_TYPE (NautilusDesktopWindow, nautilus_desktop_window,
95 NAUTILUS_TYPE_WINDOW);
96
97-@@ -65,17 +91,147 @@
98+@@ -65,17 +91,141 @@
99 GtkAction *action;
100 AtkObject *accessible;
101 NautilusDesktopWindow *window = NAUTILUS_DESKTOP_WINDOW (obj);
102@@ -184,16 +184,10 @@
103 +
104 + action = gtk_action_group_get_action(agroup, NAUTILUS_ACTION_RELOAD);
105 + gtk_action_set_visible(action, FALSE);
106-+
107-+ action = gtk_action_group_get_action(agroup, "Backgrounds and Emblems");
108-+ gtk_action_set_visible(action, FALSE);
109-+
110++
111 + action = gtk_action_group_get_action(agroup, "Preferences");
112 + gtk_action_set_visible(action, FALSE);
113-+
114-+ action = gtk_action_group_get_action(agroup, "Nautilus Manual");
115-+ gtk_action_set_visible(action, FALSE);
116-+
117++
118 + action = gtk_action_group_get_action(agroup, "About Nautilus");
119 + gtk_action_set_visible(action, FALSE);
120 +
121@@ -261,7 +255,7 @@
122 /* Set the accessible name so that it doesn't inherit the cryptic desktop URI. */
123 accessible = gtk_widget_get_accessible (GTK_WIDGET (window));
124
125-@@ -106,6 +262,8 @@
126+@@ -106,6 +256,8 @@
127
128 g_object_set_data (G_OBJECT (window), "is_desktop_window",
129 GINT_TO_POINTER (1));
130@@ -272,8 +266,8 @@
131 static gint
132 Index: nautilus-3.2.1/src/nautilus-shell-ui.xml
133 ===================================================================
134---- nautilus-3.2.1.orig/src/nautilus-shell-ui.xml 2011-10-25 12:40:36.354828971 +0200
135-+++ nautilus-3.2.1/src/nautilus-shell-ui.xml 2011-10-25 12:40:36.442828972 +0200
136+--- nautilus-3.2.1.orig/src/nautilus-shell-ui.xml 2011-11-06 14:39:05.768774570 +0400
137++++ nautilus-3.2.1/src/nautilus-shell-ui.xml 2011-11-06 14:39:06.012780214 +0400
138 @@ -49,6 +49,8 @@
139 <placeholder name="Extension Actions"/>
140 <separator/>
141@@ -294,8 +288,8 @@
142 <popup name="background">
143 Index: nautilus-3.2.1/src/nautilus-window.c
144 ===================================================================
145---- nautilus-3.2.1.orig/src/nautilus-window.c 2011-10-17 22:29:15.000000000 +0200
146-+++ nautilus-3.2.1/src/nautilus-window.c 2011-10-25 12:40:36.442828972 +0200
147+--- nautilus-3.2.1.orig/src/nautilus-window.c 2011-10-18 00:29:15.000000000 +0400
148++++ nautilus-3.2.1/src/nautilus-window.c 2011-11-06 14:39:06.012780214 +0400
149 @@ -37,6 +37,7 @@
150 #include "nautilus-location-bar.h"
151 #include "nautilus-mime-actions.h"
152@@ -317,8 +311,8 @@
153 data->id = g_strdup (identifier);
154 Index: nautilus-3.2.1/src/Makefile.in
155 ===================================================================
156---- nautilus-3.2.1.orig/src/Makefile.in 2011-10-17 23:20:58.000000000 +0200
157-+++ nautilus-3.2.1/src/Makefile.in 2011-10-25 12:40:36.446828971 +0200
158+--- nautilus-3.2.1.orig/src/Makefile.in 2011-10-18 01:20:58.000000000 +0400
159++++ nautilus-3.2.1/src/Makefile.in 2011-11-06 14:39:06.016780301 +0400
160 @@ -551,6 +551,7 @@
161 nautilus-file-management-properties.ui \
162 nautilus-bookmarks-window.ui \

Subscribers

People subscribed via source and target branches

to all changes: