Merge lp:~3v1n0/nautilus/reuse-already-opened-views into lp:~ubuntu-desktop/nautilus/ubuntu
- reuse-already-opened-views
- Merge into ubuntu
Status: | Merged |
---|---|
Merged at revision: | 362 |
Proposed branch: | lp:~3v1n0/nautilus/reuse-already-opened-views |
Merge into: | lp:~ubuntu-desktop/nautilus/ubuntu |
Prerequisite: | lp:~3v1n0/nautilus/progress-quicklist-improvements |
Diff against target: |
555 lines (+366/-34) 6 files modified
debian/changelog (+10/-1) debian/patches/10_reuse_already_opened_views.patch (+302/-0) debian/patches/12_unity_launcher_support.patch (+35/-28) debian/patches/17_static_unity_quicklist.patch (+5/-5) debian/patches/19_add_desktop_keywords.patch (+12/-0) debian/patches/series (+2/-0) |
To merge this branch: | bzr merge lp:~3v1n0/nautilus/reuse-already-opened-views |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+152981@code.launchpad.net |
This proposal supersedes a proposal from 2013-03-12.
Commit message
* debian/
- Try to reuse the available windows or tabs when opening an already opened
location (lp: #692444)
* debian/
- Use the quicklist activation timestamp to set the application user time
so that the opened windows will be focused (lp: #1154237)
* debian/
- Use nautilus --new-window to open a New window
Description of the change
- Backported the upstream patches I wrote to fix bug https:/
- Updated the unity launcher support patch to use g_application_open to use the same codepath
- Updated the Exec and the static quicklist to use the --new-window flag
- 364. By Marco Trevisan (Treviño)
-
debian/changelog: added missing entry
- 365. By Marco Trevisan (Treviño)
-
debian/
patches/ 10_reuse_ already_ opened_ views.patch: added DEP-3 headers
Preview Diff
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2013-03-13 12:40:27 +0000 | |||
3 | +++ debian/changelog 2013-03-13 12:40:27 +0000 | |||
4 | @@ -1,10 +1,19 @@ | |||
5 | 1 | nautilus (1:3.6.3-0ubuntu9) UNRELEASED; urgency=low | 1 | nautilus (1:3.6.3-0ubuntu9) UNRELEASED; urgency=low |
6 | 2 | 2 | ||
7 | 3 | * debian/patches/10_reuse_already_opened_views.patch | ||
8 | 4 | - Try to reuse the available windows or tabs when opening an already opened | ||
9 | 5 | location (lp: #692444) | ||
10 | 3 | * debian/patches/12_unity_launcher_support.patch: | 6 | * debian/patches/12_unity_launcher_support.patch: |
11 | 4 | - Quicklist entries to show the copy dialog should use a separator (lp: #1154109) | 7 | - Quicklist entries to show the copy dialog should use a separator (lp: #1154109) |
12 | 5 | - Transfer dialog should be presented using the correct timestamp (lp: #1154111) | 8 | - Transfer dialog should be presented using the correct timestamp (lp: #1154111) |
13 | 9 | - Use the quicklist activation timestamp to set the application user time | ||
14 | 10 | so that the opened windows will be focused (lp: #1154237) | ||
15 | 11 | * debian/patches/17_static_unity_quicklist.patch: | ||
16 | 12 | - Use nautilus --new-window to open a New window | ||
17 | 13 | * debian/patches/19_add_desktop_keywords.patch: | ||
18 | 14 | - Adding .desktop files keywords from upstream | ||
19 | 6 | 15 | ||
21 | 7 | -- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 12 Mar 2013 15:31:21 +0100 | 16 | -- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 12 Mar 2013 18:57:21 +0100 |
22 | 8 | 17 | ||
23 | 9 | nautilus (1:3.6.3-0ubuntu8) raring; urgency=low | 18 | nautilus (1:3.6.3-0ubuntu8) raring; urgency=low |
24 | 10 | 19 | ||
25 | 11 | 20 | ||
26 | === added file 'debian/patches/10_reuse_already_opened_views.patch' | |||
27 | --- debian/patches/10_reuse_already_opened_views.patch 1970-01-01 00:00:00 +0000 | |||
28 | +++ debian/patches/10_reuse_already_opened_views.patch 2013-03-13 12:40:27 +0000 | |||
29 | @@ -0,0 +1,302 @@ | |||
30 | 1 | Description: Focus already opened nautilus windows or tabs when an already | ||
31 | 2 | opened location is requested. Add a --new-window command to force the opening | ||
32 | 3 | of a new window. | ||
33 | 4 | |||
34 | 5 | Origin: upstream, https://git.gnome.org/browse/nautilus/commit/?id=c8ee0c5 | ||
35 | 6 | https://git.gnome.org/browse/nautilus/commit/?id=d0b0b | ||
36 | 7 | https://git.gnome.org/browse/nautilus/commit/?id=ce4255cf | ||
37 | 8 | Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694034 | ||
38 | 9 | Bug-Ubuntu: https://bugs.launchpad.net/nautilus/+bug/692444 | ||
39 | 10 | Forwarded: yes | ||
40 | 11 | Applied-Upstream: 3.7.91 | ||
41 | 12 | Author: Marco Trevisan <marco@ubuntu.com> | ||
42 | 13 | |||
43 | 14 | Index: nautilus/data/nautilus.desktop.in.in | ||
44 | 15 | =================================================================== | ||
45 | 16 | --- nautilus.orig/data/nautilus.desktop.in.in 2013-03-12 19:34:31.066512196 +0100 | ||
46 | 17 | +++ nautilus/data/nautilus.desktop.in.in 2013-03-12 19:34:41.726459664 +0100 | ||
47 | 18 | @@ -1,7 +1,7 @@ | ||
48 | 19 | [Desktop Entry] | ||
49 | 20 | _Name=Files | ||
50 | 21 | _Comment=Access and organize files | ||
51 | 22 | -Exec=nautilus %U | ||
52 | 23 | +Exec=nautilus --new-window %U | ||
53 | 24 | Icon=system-file-manager | ||
54 | 25 | Terminal=false | ||
55 | 26 | Type=Application | ||
56 | 27 | Index: nautilus/libnautilus-private/nautilus-file-utilities.c | ||
57 | 28 | =================================================================== | ||
58 | 29 | --- nautilus.orig/libnautilus-private/nautilus-file-utilities.c 2013-03-12 19:34:31.066512196 +0100 | ||
59 | 30 | +++ nautilus/libnautilus-private/nautilus-file-utilities.c 2013-03-12 19:34:31.058512174 +0100 | ||
60 | 31 | @@ -1296,6 +1296,48 @@ | ||
61 | 32 | return NULL; | ||
62 | 33 | } | ||
63 | 34 | |||
64 | 35 | +gboolean | ||
65 | 36 | +nautilus_file_selection_equal (GList *selection_a, | ||
66 | 37 | + GList *selection_b) | ||
67 | 38 | +{ | ||
68 | 39 | + GList *al, *bl; | ||
69 | 40 | + gboolean selection_matches; | ||
70 | 41 | + | ||
71 | 42 | + if (selection_a == NULL || selection_b == NULL) { | ||
72 | 43 | + return (selection_a == selection_b); | ||
73 | 44 | + } | ||
74 | 45 | + | ||
75 | 46 | + if (g_list_length (selection_a) != g_list_length (selection_b)) { | ||
76 | 47 | + return FALSE; | ||
77 | 48 | + } | ||
78 | 49 | + | ||
79 | 50 | + selection_matches = TRUE; | ||
80 | 51 | + | ||
81 | 52 | + for (al = selection_a; al; al = al->next) { | ||
82 | 53 | + GFile *a_location = nautilus_file_get_location (NAUTILUS_FILE (al->data)); | ||
83 | 54 | + gboolean found = FALSE; | ||
84 | 55 | + | ||
85 | 56 | + for (bl = selection_b; bl; bl = bl->next) { | ||
86 | 57 | + GFile *b_location = nautilus_file_get_location (NAUTILUS_FILE (bl->data)); | ||
87 | 58 | + found = g_file_equal (b_location, a_location); | ||
88 | 59 | + g_object_unref (b_location); | ||
89 | 60 | + | ||
90 | 61 | + if (found) { | ||
91 | 62 | + break; | ||
92 | 63 | + } | ||
93 | 64 | + } | ||
94 | 65 | + | ||
95 | 66 | + selection_matches = found; | ||
96 | 67 | + g_object_unref (a_location); | ||
97 | 68 | + | ||
98 | 69 | + if (!selection_matches) { | ||
99 | 70 | + break; | ||
100 | 71 | + } | ||
101 | 72 | + } | ||
102 | 73 | + | ||
103 | 74 | + return selection_matches; | ||
104 | 75 | +} | ||
105 | 76 | + | ||
106 | 77 | #if !defined (NAUTILUS_OMIT_SELF_CHECK) | ||
107 | 78 | |||
108 | 79 | void | ||
109 | 80 | Index: nautilus/libnautilus-private/nautilus-file-utilities.h | ||
110 | 81 | =================================================================== | ||
111 | 82 | --- nautilus.orig/libnautilus-private/nautilus-file-utilities.h 2013-03-12 19:34:31.066512196 +0100 | ||
112 | 83 | +++ nautilus/libnautilus-private/nautilus-file-utilities.h 2013-03-12 19:34:31.058512174 +0100 | ||
113 | 84 | @@ -95,4 +95,6 @@ | ||
114 | 85 | GCancellable *cancellable, | ||
115 | 86 | gpointer user_data); | ||
116 | 87 | |||
117 | 88 | +gboolean nautilus_file_selection_equal (GList *selection_a, GList *selection_b); | ||
118 | 89 | + | ||
119 | 90 | #endif /* NAUTILUS_FILE_UTILITIES_H */ | ||
120 | 91 | Index: nautilus/src/nautilus-application.c | ||
121 | 92 | =================================================================== | ||
122 | 93 | --- nautilus.orig/src/nautilus-application.c 2013-03-12 19:34:31.066512196 +0100 | ||
123 | 94 | +++ nautilus/src/nautilus-application.c 2013-03-12 19:34:31.058512174 +0100 | ||
124 | 95 | @@ -576,6 +576,47 @@ | ||
125 | 96 | } | ||
126 | 97 | } | ||
127 | 98 | |||
128 | 99 | +static NautilusWindowSlot * | ||
129 | 100 | +get_window_slot_for_location (NautilusApplication *application, GFile *location) | ||
130 | 101 | +{ | ||
131 | 102 | + NautilusWindowSlot *slot; | ||
132 | 103 | + GList *l, *sl; | ||
133 | 104 | + | ||
134 | 105 | + slot = NULL; | ||
135 | 106 | + | ||
136 | 107 | + if (g_file_query_file_type (location, G_FILE_QUERY_INFO_NONE, NULL) != G_FILE_TYPE_DIRECTORY) { | ||
137 | 108 | + location = g_file_get_parent (location); | ||
138 | 109 | + } else { | ||
139 | 110 | + g_object_ref (location); | ||
140 | 111 | + } | ||
141 | 112 | + | ||
142 | 113 | + for (l = gtk_application_get_windows (GTK_APPLICATION (application)); l; l = l->next) { | ||
143 | 114 | + NautilusWindow *win = NAUTILUS_WINDOW (l->data); | ||
144 | 115 | + | ||
145 | 116 | + if (NAUTILUS_IS_DESKTOP_WINDOW (win)) | ||
146 | 117 | + continue; | ||
147 | 118 | + | ||
148 | 119 | + for (sl = nautilus_window_get_slots (win); sl; sl = sl->next) { | ||
149 | 120 | + NautilusWindowSlot *current = NAUTILUS_WINDOW_SLOT (sl->data); | ||
150 | 121 | + GFile *slot_location = nautilus_window_slot_get_location (current); | ||
151 | 122 | + | ||
152 | 123 | + if (g_file_equal (slot_location, location)) { | ||
153 | 124 | + slot = current; | ||
154 | 125 | + break; | ||
155 | 126 | + } | ||
156 | 127 | + } | ||
157 | 128 | + | ||
158 | 129 | + if (slot) { | ||
159 | 130 | + break; | ||
160 | 131 | + } | ||
161 | 132 | + } | ||
162 | 133 | + | ||
163 | 134 | + g_object_unref (location); | ||
164 | 135 | + | ||
165 | 136 | + return slot; | ||
166 | 137 | +} | ||
167 | 138 | + | ||
168 | 139 | + | ||
169 | 140 | static void | ||
170 | 141 | open_window (NautilusApplication *application, | ||
171 | 142 | GFile *location, GdkScreen *screen, const char *geometry) | ||
172 | 143 | @@ -609,6 +650,7 @@ | ||
173 | 144 | |||
174 | 145 | static void | ||
175 | 146 | open_windows (NautilusApplication *application, | ||
176 | 147 | + gboolean force_new, | ||
177 | 148 | GFile **files, | ||
178 | 149 | gint n_files, | ||
179 | 150 | GdkScreen *screen, | ||
180 | 151 | @@ -621,8 +663,22 @@ | ||
181 | 152 | open_window (application, NULL, screen, geometry); | ||
182 | 153 | } else { | ||
183 | 154 | /* Open windows at each requested location. */ | ||
184 | 155 | - for (i = 0; i < n_files; i++) { | ||
185 | 156 | - open_window (application, files[i], screen, geometry); | ||
186 | 157 | + for (i = 0; i < n_files; ++i) { | ||
187 | 158 | + NautilusWindowSlot *slot = NULL; | ||
188 | 159 | + | ||
189 | 160 | + if (!force_new) | ||
190 | 161 | + slot = get_window_slot_for_location (application, files[i]); | ||
191 | 162 | + | ||
192 | 163 | + if (!slot) { | ||
193 | 164 | + open_window (application, files[i], screen, geometry); | ||
194 | 165 | + } else { | ||
195 | 166 | + /* We open the location again to update any possible selection */ | ||
196 | 167 | + nautilus_window_slot_open_location (slot, files[i], 0); | ||
197 | 168 | + | ||
198 | 169 | + NautilusWindow *window = nautilus_window_slot_get_window (slot); | ||
199 | 170 | + nautilus_window_set_active_slot (window, slot); | ||
200 | 171 | + gtk_window_present (GTK_WINDOW (window)); | ||
201 | 172 | + } | ||
202 | 173 | } | ||
203 | 174 | } | ||
204 | 175 | } | ||
205 | 176 | @@ -634,19 +690,28 @@ | ||
206 | 177 | const char *startup_id) | ||
207 | 178 | { | ||
208 | 179 | NautilusWindow *window; | ||
209 | 180 | + NautilusWindowSlot *slot; | ||
210 | 181 | GList *sel_list = NULL; | ||
211 | 182 | |||
212 | 183 | nautilus_profile_start (NULL); | ||
213 | 184 | |||
214 | 185 | - window = nautilus_application_create_window (application, gdk_screen_get_default ()); | ||
215 | 186 | - gtk_window_set_startup_id (GTK_WINDOW (window), startup_id); | ||
216 | 187 | + slot = get_window_slot_for_location (application, location); | ||
217 | 188 | + | ||
218 | 189 | + if (!slot) { | ||
219 | 190 | + window = nautilus_application_create_window (application, gdk_screen_get_default ()); | ||
220 | 191 | + slot = nautilus_window_get_active_slot (window); | ||
221 | 192 | + } else { | ||
222 | 193 | + window = nautilus_window_slot_get_window (slot); | ||
223 | 194 | + nautilus_window_set_active_slot (window, slot); | ||
224 | 195 | + gtk_window_present (GTK_WINDOW (window)); | ||
225 | 196 | + } | ||
226 | 197 | |||
227 | 198 | if (selection != NULL) { | ||
228 | 199 | sel_list = g_list_prepend (sel_list, nautilus_file_get (selection)); | ||
229 | 200 | } | ||
230 | 201 | |||
231 | 202 | - nautilus_window_slot_open_location_full (nautilus_window_get_active_slot (window), location, | ||
232 | 203 | - 0, sel_list, NULL, NULL); | ||
233 | 204 | + gtk_window_set_startup_id (GTK_WINDOW (window), startup_id); | ||
234 | 205 | + nautilus_window_slot_open_location_full (slot, location, 0, sel_list, NULL, NULL); | ||
235 | 206 | |||
236 | 207 | if (sel_list != NULL) { | ||
237 | 208 | nautilus_file_list_free (sel_list); | ||
238 | 209 | @@ -665,7 +730,9 @@ | ||
239 | 210 | |||
240 | 211 | DEBUG ("Open called on the GApplication instance; %d files", n_files); | ||
241 | 212 | |||
242 | 213 | - open_windows (self, files, n_files, | ||
243 | 214 | + gboolean force_new = (g_strcmp0 (hint, "new-window") == 0); | ||
244 | 215 | + | ||
245 | 216 | + open_windows (self, force_new, files, n_files, | ||
246 | 217 | gdk_screen_get_default (), | ||
247 | 218 | self->priv->geometry); | ||
248 | 219 | } | ||
249 | 220 | @@ -1059,6 +1126,7 @@ | ||
250 | 221 | gboolean version = FALSE; | ||
251 | 222 | gboolean browser = FALSE; | ||
252 | 223 | gboolean kill_shell = FALSE; | ||
253 | 224 | + gboolean open_new_window = FALSE; | ||
254 | 225 | gboolean no_default_window = FALSE; | ||
255 | 226 | gchar **remaining = NULL; | ||
256 | 227 | NautilusApplication *self = NAUTILUS_APPLICATION (application); | ||
257 | 228 | @@ -1075,6 +1143,8 @@ | ||
258 | 229 | N_("Show the version of the program."), NULL }, | ||
259 | 230 | { "geometry", 'g', 0, G_OPTION_ARG_STRING, &self->priv->geometry, | ||
260 | 231 | N_("Create the initial window with the given geometry."), N_("GEOMETRY") }, | ||
261 | 232 | + { "new-window", 'w', 0, G_OPTION_ARG_NONE, &open_new_window, | ||
262 | 233 | + N_("Always open a new window for browsing specified URIs"), NULL }, | ||
263 | 234 | { "no-default-window", 'n', 0, G_OPTION_ARG_NONE, &no_default_window, | ||
264 | 235 | N_("Only create windows for explicitly specified URIs."), NULL }, | ||
265 | 236 | { "no-desktop", '\0', 0, G_OPTION_ARG_NONE, &self->priv->no_desktop, | ||
266 | 237 | @@ -1089,7 +1159,6 @@ | ||
267 | 238 | GError *error = NULL; | ||
268 | 239 | gint argc = 0; | ||
269 | 240 | gchar **argv = NULL; | ||
270 | 241 | - | ||
271 | 242 | *exit_status = EXIT_SUCCESS; | ||
272 | 243 | |||
273 | 244 | nautilus_profile_start (NULL); | ||
274 | 245 | @@ -1127,8 +1196,8 @@ | ||
275 | 246 | goto out; | ||
276 | 247 | } | ||
277 | 248 | |||
278 | 249 | - DEBUG ("Parsing local command line, no_default_window %d, quit %d, " | ||
279 | 250 | - "self checks %d, no_desktop %d", | ||
280 | 251 | + DEBUG ("Parsing local command line, open_new_window %d, no_default_window %d, " | ||
281 | 252 | + "quit %d, self checks %d, no_desktop %d", open_new_window, | ||
282 | 253 | no_default_window, kill_shell, perform_self_check, self->priv->no_desktop); | ||
283 | 254 | |||
284 | 255 | g_application_register (application, NULL, &error); | ||
285 | 256 | @@ -1185,7 +1254,7 @@ | ||
286 | 257 | |||
287 | 258 | /* Invoke "Open" to create new windows */ | ||
288 | 259 | if (len > 0) { | ||
289 | 260 | - g_application_open (application, files, len, ""); | ||
290 | 261 | + g_application_open (application, files, len, open_new_window ? "new-window" : ""); | ||
291 | 262 | } | ||
292 | 263 | |||
293 | 264 | for (idx = 0; idx < len; idx++) { | ||
294 | 265 | Index: nautilus/src/nautilus-window-manage-views.c | ||
295 | 266 | =================================================================== | ||
296 | 267 | --- nautilus.orig/src/nautilus-window-manage-views.c 2013-03-12 19:34:31.066512196 +0100 | ||
297 | 268 | +++ nautilus/src/nautilus-window-manage-views.c 2013-03-12 19:34:31.062512185 +0100 | ||
298 | 269 | @@ -427,6 +427,7 @@ | ||
299 | 270 | NautilusWindowSlot *target_slot; | ||
300 | 271 | NautilusWindowOpenFlags slot_flags; | ||
301 | 272 | GFile *old_location; | ||
302 | 273 | + GList *old_selection; | ||
303 | 274 | char *old_uri, *new_uri; | ||
304 | 275 | int new_slot_position; | ||
305 | 276 | gboolean use_same; | ||
306 | 277 | @@ -525,9 +526,14 @@ | ||
307 | 278 | } | ||
308 | 279 | } | ||
309 | 280 | |||
310 | 281 | - if (target_window == window && target_slot == slot && | ||
311 | 282 | + old_selection = NULL; | ||
312 | 283 | + if (slot->content_view != NULL) { | ||
313 | 284 | + old_selection = nautilus_view_get_selection (slot->content_view); | ||
314 | 285 | + } | ||
315 | 286 | + | ||
316 | 287 | + if (target_window == window && target_slot == slot && !is_desktop && | ||
317 | 288 | old_location && g_file_equal (old_location, location) && | ||
318 | 289 | - !is_desktop) { | ||
319 | 290 | + nautilus_file_selection_equal (old_selection, new_selection)) { | ||
320 | 291 | |||
321 | 292 | if (callback != NULL) { | ||
322 | 293 | callback (window, location, NULL, user_data); | ||
323 | 294 | @@ -537,7 +543,7 @@ | ||
324 | 295 | } | ||
325 | 296 | |||
326 | 297 | slot->pending_use_default_location = ((flags & NAUTILUS_WINDOW_OPEN_FLAG_USE_DEFAULT_LOCATION) != 0); | ||
327 | 298 | - begin_location_change (target_slot, location, old_location, new_selection, | ||
328 | 299 | + begin_location_change (target_slot, location, old_location, new_selection, | ||
329 | 300 | NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data); | ||
330 | 301 | |||
331 | 302 | done: | ||
332 | 0 | 303 | ||
333 | === modified file 'debian/patches/12_unity_launcher_support.patch' | |||
334 | --- debian/patches/12_unity_launcher_support.patch 2013-03-13 12:40:27 +0000 | |||
335 | +++ debian/patches/12_unity_launcher_support.patch 2013-03-13 12:40:27 +0000 | |||
336 | @@ -1,8 +1,8 @@ | |||
337 | 1 | === modified file 'configure.in' | 1 | === modified file 'configure.in' |
338 | 2 | Index: nautilus/configure.in | 2 | Index: nautilus/configure.in |
339 | 3 | =================================================================== | 3 | =================================================================== |
342 | 4 | --- nautilus.orig/configure.in 2013-03-12 13:29:48.958239697 +0100 | 4 | --- nautilus.orig/configure.in 2013-03-12 17:57:43.417743091 +0100 |
343 | 5 | +++ nautilus/configure.in 2013-03-12 13:29:48.950239703 +0100 | 5 | +++ nautilus/configure.in 2013-03-12 17:57:43.413743092 +0100 |
344 | 6 | @@ -10,6 +10,8 @@ | 6 | @@ -10,6 +10,8 @@ |
345 | 7 | m4_define(exif_minver, 0.6.20) | 7 | m4_define(exif_minver, 0.6.20) |
346 | 8 | m4_define(exempi_minver, 2.1.0) | 8 | m4_define(exempi_minver, 2.1.0) |
347 | @@ -52,8 +52,8 @@ | |||
348 | 52 | 52 | ||
349 | 53 | Index: nautilus/libnautilus-private/nautilus-progress-info.c | 53 | Index: nautilus/libnautilus-private/nautilus-progress-info.c |
350 | 54 | =================================================================== | 54 | =================================================================== |
353 | 55 | --- nautilus.orig/libnautilus-private/nautilus-progress-info.c 2013-03-12 13:29:48.958239697 +0100 | 55 | --- nautilus.orig/libnautilus-private/nautilus-progress-info.c 2013-03-12 17:57:43.417743091 +0100 |
354 | 56 | +++ nautilus/libnautilus-private/nautilus-progress-info.c 2013-03-12 13:29:48.950239703 +0100 | 56 | +++ nautilus/libnautilus-private/nautilus-progress-info.c 2013-03-12 17:57:43.413743092 +0100 |
355 | 57 | @@ -52,6 +52,8 @@ | 57 | @@ -52,6 +52,8 @@ |
356 | 58 | char *status; | 58 | char *status; |
357 | 59 | char *details; | 59 | char *details; |
358 | @@ -117,8 +117,8 @@ | |||
359 | 117 | } | 117 | } |
360 | 118 | Index: nautilus/libnautilus-private/nautilus-progress-info.h | 118 | Index: nautilus/libnautilus-private/nautilus-progress-info.h |
361 | 119 | =================================================================== | 119 | =================================================================== |
364 | 120 | --- nautilus.orig/libnautilus-private/nautilus-progress-info.h 2013-03-12 13:29:48.958239697 +0100 | 120 | --- nautilus.orig/libnautilus-private/nautilus-progress-info.h 2013-03-12 17:57:43.417743091 +0100 |
365 | 121 | +++ nautilus/libnautilus-private/nautilus-progress-info.h 2013-03-12 13:29:48.950239703 +0100 | 121 | +++ nautilus/libnautilus-private/nautilus-progress-info.h 2013-03-12 17:57:43.413743092 +0100 |
366 | 122 | @@ -62,6 +62,8 @@ | 122 | @@ -62,6 +62,8 @@ |
367 | 123 | gboolean nautilus_progress_info_get_is_started (NautilusProgressInfo *info); | 123 | gboolean nautilus_progress_info_get_is_started (NautilusProgressInfo *info); |
368 | 124 | gboolean nautilus_progress_info_get_is_finished (NautilusProgressInfo *info); | 124 | gboolean nautilus_progress_info_get_is_finished (NautilusProgressInfo *info); |
369 | @@ -130,8 +130,8 @@ | |||
370 | 130 | void nautilus_progress_info_finish (NautilusProgressInfo *info); | 130 | void nautilus_progress_info_finish (NautilusProgressInfo *info); |
371 | 131 | Index: nautilus/src/Makefile.am | 131 | Index: nautilus/src/Makefile.am |
372 | 132 | =================================================================== | 132 | =================================================================== |
375 | 133 | --- nautilus.orig/src/Makefile.am 2013-03-12 13:29:48.958239697 +0100 | 133 | --- nautilus.orig/src/Makefile.am 2013-03-12 17:57:43.417743091 +0100 |
376 | 134 | +++ nautilus/src/Makefile.am 2013-03-12 13:29:48.950239703 +0100 | 134 | +++ nautilus/src/Makefile.am 2013-03-12 17:57:43.413743092 +0100 |
377 | 135 | @@ -31,6 +31,7 @@ | 135 | @@ -31,6 +31,7 @@ |
378 | 136 | -DSYSCONFDIR=\""$(sysconfdir)"\" \ | 136 | -DSYSCONFDIR=\""$(sysconfdir)"\" \ |
379 | 137 | -DVERSION="\"$(VERSION)\"" \ | 137 | -DVERSION="\"$(VERSION)\"" \ |
380 | @@ -161,8 +161,8 @@ | |||
381 | 161 | nodist_nautilus_SOURCES = \ | 161 | nodist_nautilus_SOURCES = \ |
382 | 162 | Index: nautilus/src/nautilus-progress-ui-handler.c | 162 | Index: nautilus/src/nautilus-progress-ui-handler.c |
383 | 163 | =================================================================== | 163 | =================================================================== |
386 | 164 | --- nautilus.orig/src/nautilus-progress-ui-handler.c 2013-03-12 13:29:48.958239697 +0100 | 164 | --- nautilus.orig/src/nautilus-progress-ui-handler.c 2013-03-12 17:57:43.417743091 +0100 |
387 | 165 | +++ nautilus/src/nautilus-progress-ui-handler.c 2013-03-12 15:25:31.435572751 +0100 | 165 | +++ nautilus/src/nautilus-progress-ui-handler.c 2013-03-12 17:57:43.413743092 +0100 |
388 | 166 | @@ -38,6 +38,11 @@ | 166 | @@ -38,6 +38,11 @@ |
389 | 167 | 167 | ||
390 | 168 | #include <libnotify/notify.h> | 168 | #include <libnotify/notify.h> |
391 | @@ -432,7 +432,7 @@ | |||
392 | 432 | Index: nautilus/src/unity-quicklist-handler.c | 432 | Index: nautilus/src/unity-quicklist-handler.c |
393 | 433 | =================================================================== | 433 | =================================================================== |
394 | 434 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 434 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
396 | 435 | +++ nautilus/src/unity-quicklist-handler.c 2013-03-12 14:07:43.835192621 +0100 | 435 | +++ nautilus/src/unity-quicklist-handler.c 2013-03-12 17:57:43.413743092 +0100 |
397 | 436 | @@ -0,0 +1,153 @@ | 436 | @@ -0,0 +1,153 @@ |
398 | 437 | +/*unity-quicklist-handler.c: handle Unity quicklists | 437 | +/*unity-quicklist-handler.c: handle Unity quicklists |
399 | 438 | + * | 438 | + * |
400 | @@ -590,7 +590,7 @@ | |||
401 | 590 | Index: nautilus/src/unity-quicklist-handler.h | 590 | Index: nautilus/src/unity-quicklist-handler.h |
402 | 591 | =================================================================== | 591 | =================================================================== |
403 | 592 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 592 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
405 | 593 | +++ nautilus/src/unity-quicklist-handler.h 2013-03-12 14:07:14.835176946 +0100 | 593 | +++ nautilus/src/unity-quicklist-handler.h 2013-03-12 17:57:43.413743092 +0100 |
406 | 594 | @@ -0,0 +1,75 @@ | 594 | @@ -0,0 +1,75 @@ |
407 | 595 | +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ | 595 | +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ |
408 | 596 | +/* | 596 | +/* |
409 | @@ -669,8 +669,8 @@ | |||
410 | 669 | +#endif /* __UNITY_QUICKLIST_HANDLER_H__ */ | 669 | +#endif /* __UNITY_QUICKLIST_HANDLER_H__ */ |
411 | 670 | Index: nautilus/src/nautilus-application.c | 670 | Index: nautilus/src/nautilus-application.c |
412 | 671 | =================================================================== | 671 | =================================================================== |
415 | 672 | --- nautilus.orig/src/nautilus-application.c 2013-03-12 13:29:48.958239697 +0100 | 672 | --- nautilus.orig/src/nautilus-application.c 2013-03-12 17:57:43.417743091 +0100 |
416 | 673 | +++ nautilus/src/nautilus-application.c 2013-03-12 13:29:48.954239700 +0100 | 673 | +++ nautilus/src/nautilus-application.c 2013-03-12 17:57:43.417743091 +0100 |
417 | 674 | @@ -79,6 +79,10 @@ | 674 | @@ -79,6 +79,10 @@ |
418 | 675 | #include <gdk/gdkx.h> | 675 | #include <gdk/gdkx.h> |
419 | 676 | #include <gtk/gtk.h> | 676 | #include <gtk/gtk.h> |
420 | @@ -682,7 +682,7 @@ | |||
421 | 682 | /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */ | 682 | /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */ |
422 | 683 | #define APPLICATION_WINDOW_MIN_WIDTH 300 | 683 | #define APPLICATION_WINDOW_MIN_WIDTH 300 |
423 | 684 | #define APPLICATION_WINDOW_MIN_HEIGHT 100 | 684 | #define APPLICATION_WINDOW_MIN_HEIGHT 100 |
425 | 685 | @@ -1479,6 +1483,10 @@ | 685 | @@ -1548,6 +1552,10 @@ |
426 | 686 | nautilus_application_init_actions (self); | 686 | nautilus_application_init_actions (self); |
427 | 687 | 687 | ||
428 | 688 | nautilus_profile_end (NULL); | 688 | nautilus_profile_end (NULL); |
429 | @@ -696,8 +696,8 @@ | |||
430 | 696 | Index: nautilus/src/unity-bookmarks-handler.c | 696 | Index: nautilus/src/unity-bookmarks-handler.c |
431 | 697 | =================================================================== | 697 | =================================================================== |
432 | 698 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 698 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
435 | 699 | +++ nautilus/src/unity-bookmarks-handler.c 2013-03-12 13:29:48.954239700 +0100 | 699 | +++ nautilus/src/unity-bookmarks-handler.c 2013-03-12 18:57:09.410958729 +0100 |
436 | 700 | @@ -0,0 +1,137 @@ | 700 | @@ -0,0 +1,144 @@ |
437 | 701 | +/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist | 701 | +/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist |
438 | 702 | + * | 702 | + * |
439 | 703 | + * Copyright (C) 2012 Canonical | 703 | + * Copyright (C) 2012 Canonical |
440 | @@ -741,19 +741,26 @@ | |||
441 | 741 | + guint timestamp, | 741 | + guint timestamp, |
442 | 742 | + NautilusBookmark *bookmark) | 742 | + NautilusBookmark *bookmark) |
443 | 743 | +{ | 743 | +{ |
445 | 744 | + g_assert (NAUTILUS_IS_BOOKMARK (bookmark)); | 744 | + g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark)); |
446 | 745 | + | 745 | + |
448 | 746 | + GFile *location; | 746 | + GFile *locations[2]; |
449 | 747 | + GList *windows, *l; | ||
450 | 747 | + NautilusApplication *application; | 748 | + NautilusApplication *application; |
451 | 748 | + NautilusWindow *new_window; | ||
452 | 749 | + | 749 | + |
454 | 750 | + location = nautilus_bookmark_get_location (bookmark); | 750 | + locations[0] = nautilus_bookmark_get_location (bookmark); |
455 | 751 | + locations[1] = NULL; | ||
456 | 751 | + | 752 | + |
457 | 752 | + application = NAUTILUS_APPLICATION (g_application_get_default ()); | 753 | + application = NAUTILUS_APPLICATION (g_application_get_default ()); |
462 | 753 | + new_window = nautilus_application_create_window (application, gdk_screen_get_default ()); | 754 | + |
463 | 754 | + nautilus_window_slot_open_location (nautilus_window_get_active_slot (new_window), location, 0); | 755 | + /* Make sure that the application timestamp matches the event */ |
464 | 755 | + | 756 | + for (l = gtk_application_get_windows (GTK_APPLICATION (application)); l; l = l->next) { |
465 | 756 | + g_object_unref (location); | 757 | + GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (l->data)); |
466 | 758 | + gdk_x11_window_set_user_time (gdk_window, timestamp); | ||
467 | 759 | + } | ||
468 | 760 | + | ||
469 | 761 | + g_application_open (G_APPLICATION (application), locations, 1, ""); | ||
470 | 762 | + | ||
471 | 763 | + g_object_unref (locations[0]); | ||
472 | 757 | +} | 764 | +} |
473 | 758 | + | 765 | + |
474 | 759 | +static void | 766 | +static void |
475 | @@ -838,7 +845,7 @@ | |||
476 | 838 | Index: nautilus/src/unity-bookmarks-handler.h | 845 | Index: nautilus/src/unity-bookmarks-handler.h |
477 | 839 | =================================================================== | 846 | =================================================================== |
478 | 840 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 847 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
480 | 841 | +++ nautilus/src/unity-bookmarks-handler.h 2013-03-12 13:29:48.954239700 +0100 | 848 | +++ nautilus/src/unity-bookmarks-handler.h 2013-03-12 17:57:43.417743091 +0100 |
481 | 842 | @@ -0,0 +1,31 @@ | 849 | @@ -0,0 +1,31 @@ |
482 | 843 | +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ | 850 | +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ |
483 | 844 | +/* | 851 | +/* |
484 | @@ -873,8 +880,8 @@ | |||
485 | 873 | +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/ | 880 | +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/ |
486 | 874 | Index: nautilus/po/POTFILES.in | 881 | Index: nautilus/po/POTFILES.in |
487 | 875 | =================================================================== | 882 | =================================================================== |
490 | 876 | --- nautilus.orig/po/POTFILES.in 2013-03-12 13:29:48.958239697 +0100 | 883 | --- nautilus.orig/po/POTFILES.in 2013-03-12 17:57:43.417743091 +0100 |
491 | 877 | +++ nautilus/po/POTFILES.in 2013-03-12 13:29:48.954239700 +0100 | 884 | +++ nautilus/po/POTFILES.in 2013-03-12 17:57:43.417743091 +0100 |
492 | 878 | @@ -90,3 +90,4 @@ | 885 | @@ -90,3 +90,4 @@ |
493 | 879 | src/nautilus-window-private.h | 886 | src/nautilus-window-private.h |
494 | 880 | src/nautilus-window-slot.c | 887 | src/nautilus-window-slot.c |
495 | 881 | 888 | ||
496 | === modified file 'debian/patches/17_static_unity_quicklist.patch' | |||
497 | --- debian/patches/17_static_unity_quicklist.patch 2013-03-08 13:44:44 +0000 | |||
498 | +++ debian/patches/17_static_unity_quicklist.patch 2013-03-13 12:40:27 +0000 | |||
499 | @@ -1,8 +1,8 @@ | |||
501 | 1 | Index: nautilus-3.5.5/data/nautilus.desktop.in.in | 1 | Index: nautilus/data/nautilus.desktop.in.in |
502 | 2 | =================================================================== | 2 | =================================================================== |
506 | 3 | --- nautilus-3.5.5.orig/data/nautilus.desktop.in.in 2012-05-08 06:28:08.000000000 +0200 | 3 | --- nautilus.orig/data/nautilus.desktop.in.in 2013-03-12 17:08:37.121951465 +0100 |
507 | 4 | +++ nautilus-3.5.5/data/nautilus.desktop.in.in 2012-08-08 09:41:30.183206868 +0200 | 4 | +++ nautilus/data/nautilus.desktop.in.in 2013-03-12 17:11:35.029894735 +0100 |
508 | 5 | @@ -13,3 +13,9 @@ | 5 | @@ -14,3 +14,9 @@ |
509 | 6 | X-GNOME-Bugzilla-Product=nautilus | 6 | X-GNOME-Bugzilla-Product=nautilus |
510 | 7 | X-GNOME-Bugzilla-Component=general | 7 | X-GNOME-Bugzilla-Component=general |
511 | 8 | X-GNOME-Bugzilla-Version=@VERSION@ | 8 | X-GNOME-Bugzilla-Version=@VERSION@ |
512 | @@ -10,5 +10,5 @@ | |||
513 | 10 | + | 10 | + |
514 | 11 | +[Desktop Action Window] | 11 | +[Desktop Action Window] |
515 | 12 | +_Name=Open a New Window | 12 | +_Name=Open a New Window |
517 | 13 | +Exec=nautilus | 13 | +Exec=nautilus --new-window |
518 | 14 | +OnlyShowIn=Unity; | 14 | +OnlyShowIn=Unity; |
519 | 15 | 15 | ||
520 | === added file 'debian/patches/19_add_desktop_keywords.patch' | |||
521 | --- debian/patches/19_add_desktop_keywords.patch 1970-01-01 00:00:00 +0000 | |||
522 | +++ debian/patches/19_add_desktop_keywords.patch 2013-03-13 12:40:27 +0000 | |||
523 | @@ -0,0 +1,12 @@ | |||
524 | 1 | Index: nautilus/data/nautilus.desktop.in.in | ||
525 | 2 | =================================================================== | ||
526 | 3 | --- nautilus.orig/data/nautilus.desktop.in.in 2013-03-12 19:35:01.714349423 +0100 | ||
527 | 4 | +++ nautilus/data/nautilus.desktop.in.in 2013-03-12 19:37:25.077722944 +0100 | ||
528 | 5 | @@ -1,6 +1,7 @@ | ||
529 | 6 | [Desktop Entry] | ||
530 | 7 | _Name=Files | ||
531 | 8 | _Comment=Access and organize files | ||
532 | 9 | +_Keywords=folder;manager;explore;disk;filesystem; | ||
533 | 10 | Exec=nautilus --new-window %U | ||
534 | 11 | Icon=system-file-manager | ||
535 | 12 | Terminal=false | ||
536 | 0 | 13 | ||
537 | === modified file 'debian/patches/series' | |||
538 | --- debian/patches/series 2013-03-08 13:44:44 +0000 | |||
539 | +++ debian/patches/series 2013-03-13 12:40:27 +0000 | |||
540 | @@ -4,6 +4,7 @@ | |||
541 | 4 | 06_never_exec_nonexec_launchers.patch | 4 | 06_never_exec_nonexec_launchers.patch |
542 | 5 | 08_clean_session_capplet.patch | 5 | 08_clean_session_capplet.patch |
543 | 6 | 09_no-initial-fade.patch | 6 | 09_no-initial-fade.patch |
544 | 7 | 10_reuse_already_opened_views.patch | ||
545 | 7 | 11_copy_skipping_pager.patch | 8 | 11_copy_skipping_pager.patch |
546 | 8 | 12_unity_launcher_support.patch | 9 | 12_unity_launcher_support.patch |
547 | 9 | 14_bring_del_instead_ctrl_del.patch | 10 | 14_bring_del_instead_ctrl_del.patch |
548 | @@ -11,6 +12,7 @@ | |||
549 | 11 | 16_unity_new_documents.patch | 12 | 16_unity_new_documents.patch |
550 | 12 | 17_static_unity_quicklist.patch | 13 | 17_static_unity_quicklist.patch |
551 | 13 | 18_unity_icon_color.patch | 14 | 18_unity_icon_color.patch |
552 | 15 | 19_add_desktop_keywords.patch | ||
553 | 14 | zg_activity_logging.patch | 16 | zg_activity_logging.patch |
554 | 15 | dont_wrap_labels_after_dots.patch | 17 | dont_wrap_labels_after_dots.patch |
555 | 16 | git_add_missing_tooltips.patch | 18 | git_add_missing_tooltips.patch |