Merge lp:~jbicha/nautilus/nautilus-3.8 into lp:~ubuntu-desktop/nautilus/ubuntu

Proposed by Jeremy Bicha on 2013-06-10
Status: Merged
Merged at revision: 388
Proposed branch: lp:~jbicha/nautilus/nautilus-3.8
Merge into: lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target: 2883 lines (+198/-2063)
34 files modified
debian/changelog (+40/-0)
debian/control (+5/-4)
debian/control.in (+5/-4)
debian/nautilus.install (+0/-1)
debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch (+0/-25)
debian/patches/06_never_exec_nonexec_launchers.patch (+4/-5)
debian/patches/09_no-initial-fade.patch (+0/-18)
debian/patches/12_unity_launcher_support.patch (+44/-48)
debian/patches/15_use-ubuntu-help.patch (+26/-28)
debian/patches/17_static_unity_quicklist.patch (+4/-4)
debian/patches/18_unity_icon_color.patch (+5/-5)
debian/patches/19_unity_open_location_xid.patch (+39/-29)
debian/patches/git_add_desktop_keywords.patch (+0/-12)
debian/patches/git_add_missing_tooltips.patch (+0/-88)
debian/patches/git_eel_needs_terminal.patch (+0/-175)
debian/patches/git_enable_copy_from_recent.patch (+0/-58)
debian/patches/git_enable_simple_search_engine.patch (+0/-31)
debian/patches/git_export_opened_locations_on_dbus.patch (+0/-261)
debian/patches/git_fix_touch_double_click.patch (+0/-29)
debian/patches/git_launcher_no_frame.patch (+0/-103)
debian/patches/git_margin_primary_workarea_revert.patch (+0/-60)
debian/patches/git_rank_exact_matches_higher.patch (+0/-49)
debian/patches/git_rank_reversed.patch (+0/-26)
debian/patches/git_reset_view_to_defaults.patch (+0/-18)
debian/patches/git_restore_filename.patch (+0/-46)
debian/patches/git_restore_from_missing_directories.patch (+0/-142)
debian/patches/git_reuse_already_opened_views.patch (+0/-302)
debian/patches/git_search_dir_incremental_load.patch (+0/-148)
debian/patches/git_search_dont_follow_symlinks.patch (+0/-26)
debian/patches/git_search_recursive_dir.patch (+0/-78)
debian/patches/git_show_accelerators.patch (+0/-76)
debian/patches/git_single_filesystem_count.patch (+0/-115)
debian/patches/series (+0/-23)
debian/patches/zg_activity_logging.patch (+26/-26)
To merge this branch: bzr merge lp:~jbicha/nautilus/nautilus-3.8
Reviewer Review Type Date Requested Status
VCS imports 2013-06-10 Pending
Review via email: mp+168538@code.launchpad.net

This proposal supersedes a proposal from 2013-06-05.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

Thanks Jeremy, what's the plan for the background drawing if we merge that change?

Jeremy Bicha (jbicha) wrote : Posted in a previous version of this proposal

Seb, I don't know. I've been confused about background drawing handling since
https://launchpad.net/ubuntu/+source/ubuntu-settings/12.10.7

There's quite a few different scenarios (which version of gsd? which desktop? with nautilus drawing desktop icons or not?). See also bug 1159430 which talks about Compiz some. I believe wallpaper handling in metacity will be broken (because no developer cares enough).

lp:~jbicha/nautilus/nautilus-3.8 updated on 2013-06-17
383. By Jeremy Bicha on 2013-06-10

TODO
* 16_unity_new_documents.patch: Doesn't work, the Raring
  "fix" used a bug that was fixed
  https://git.gnome.org/browse/nautilus/commit/?id=9323dd
* New upstream release (LP: #1130746)
  - Share the show-hidden-files setting with the GTK file chooser
    (LP: #1039014)
  - Limit folder size and content count to a single filesystem (LP: #585472)
* debian/nautilus.install:
  - Shell search provider doesn't need a separate library any more
* Drop git patches
* Refreshed patches

* debian/control:
  - Bump build-depends on libglib2.0-dev
* New upstream release
* debian/control:
  - Bump build-depends on libgtk-3-dev (>= 3.7.7)
* debian/patches:
  - 09_no-initial-fade.patch:
  - 10_sync_background_to_accountsservice.patch:
    + Dropped, Nautilus doesn't draw the background itself any more
* Refreshed patches
* Add build-dep on gsettings-desktop-schemas
* debian/patches:
  - 19_unity_open_location_xid.patch: updated to apply properly

384. By Jeremy Bicha on 2013-06-17

bump version to 3.8.2

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 2013-06-10 17:06:35 +0000
3+++ debian/changelog 2013-06-17 03:30:40 +0000
4@@ -1,3 +1,43 @@
5+nautilus (1:3.8.2-0ubuntu1) UNRELEASED; urgency=low
6+
7+ TODO
8+ * 16_unity_new_documents.patch: Doesn't work, the Raring
9+ "fix" used a bug that was fixed
10+ https://git.gnome.org/browse/nautilus/commit/?id=9323dd
11+
12+ [ Jeremy Bicha ]
13+ * New upstream release (LP: #1130746)
14+ - Share the show-hidden-files setting with the GTK file chooser
15+ (LP: #1039014)
16+ - Limit folder size and content count to a single filesystem (LP: #585472)
17+ * debian/nautilus.install:
18+ - Shell search provider doesn't need a separate library any more
19+ * Drop git patches
20+ * Refreshed patches
21+
22+ [ Robert Ancell ]
23+ * debian/control:
24+ - Bump build-depends on libglib2.0-dev
25+
26+ [ Rico Tzschichholz ]
27+ * New upstream release
28+ * debian/control:
29+ - Bump build-depends on libgtk-3-dev (>= 3.7.7)
30+ * debian/patches:
31+ - 09_no-initial-fade.patch:
32+ - 10_sync_background_to_accountsservice.patch:
33+ + Dropped, Nautilus doesn't draw the background itself any more
34+ * Refreshed patches
35+
36+ [ Tim Lunn ]
37+ * Add build-dep on gsettings-desktop-schemas
38+
39+ [ Marco Trevisan (Treviño) ]
40+ * debian/patches:
41+ - 19_unity_open_location_xid.patch: updated to apply properly
42+
43+ -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 10 Jun 2013 16:28:56 -0400
44+
45 nautilus (1:3.6.3-0ubuntu18) saucy; urgency=low
46
47 * debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch:
48
49=== modified file 'debian/control'
50--- debian/control 2013-05-28 10:48:02 +0000
51+++ debian/control 2013-06-17 03:30:40 +0000
52@@ -13,9 +13,9 @@
53 dh-migrations,
54 cdbs (>= 0.4.90),
55 gnome-pkg-tools (>= 0.13),
56- libglib2.0-dev (>= 2.33.13),
57+ libglib2.0-dev (>= 2.35.3),
58 libatk1.0-dev (>= 1.32.0),
59- libgtk-3-dev (>= 3.5.12),
60+ libgtk-3-dev (>= 3.7.7),
61 libgail-3-dev,
62 libgnome-desktop-3-dev (>= 3.0.0),
63 libxml2-dev (>= 2.7.8),
64@@ -31,6 +31,7 @@
65 x11proto-core-dev,
66 shared-mime-info (>= 0.50),
67 gobject-introspection (>= 0.9.12-4~),
68+ gsettings-desktop-schemas (>= 3.8.0),
69 libgirepository1.0-dev (>= 0.9.12),
70 libglib2.0-doc,
71 libgtk-3-doc,
72@@ -112,8 +113,8 @@
73 Section: libdevel
74 Depends: libnautilus-extension1a (= ${binary:Version}),
75 gir1.2-nautilus-3.0 (= ${binary:Version}),
76- libglib2.0-dev (>= 2.33.13),
77- libgtk-3-dev (>= 3.5.12),
78+ libglib2.0-dev (>= 2.35.3),
79+ libgtk-3-dev (>= 3.7.7),
80 ${shlibs:Depends},
81 ${misc:Depends}
82 Description: libraries for nautilus components - development version
83
84=== modified file 'debian/control.in'
85--- debian/control.in 2013-03-08 15:55:47 +0000
86+++ debian/control.in 2013-06-17 03:30:40 +0000
87@@ -9,9 +9,9 @@
88 dh-migrations,
89 cdbs (>= 0.4.90),
90 gnome-pkg-tools (>= 0.13),
91- libglib2.0-dev (>= 2.33.13),
92+ libglib2.0-dev (>= 2.35.3),
93 libatk1.0-dev (>= 1.32.0),
94- libgtk-3-dev (>= 3.5.12),
95+ libgtk-3-dev (>= 3.7.7),
96 libgail-3-dev,
97 libgnome-desktop-3-dev (>= 3.0.0),
98 libxml2-dev (>= 2.7.8),
99@@ -27,6 +27,7 @@
100 x11proto-core-dev,
101 shared-mime-info (>= 0.50),
102 gobject-introspection (>= 0.9.12-4~),
103+ gsettings-desktop-schemas (>= 3.8.0),
104 libgirepository1.0-dev (>= 0.9.12),
105 libglib2.0-doc,
106 libgtk-3-doc,
107@@ -108,8 +109,8 @@
108 Section: libdevel
109 Depends: libnautilus-extension1a (= ${binary:Version}),
110 gir1.2-nautilus-3.0 (= ${binary:Version}),
111- libglib2.0-dev (>= 2.33.13),
112- libgtk-3-dev (>= 3.5.12),
113+ libglib2.0-dev (>= 2.35.3),
114+ libgtk-3-dev (>= 3.7.7),
115 ${shlibs:Depends},
116 ${misc:Depends}
117 Description: libraries for nautilus components - development version
118
119=== modified file 'debian/nautilus.install'
120--- debian/nautilus.install 2012-10-29 00:09:57 +0000
121+++ debian/nautilus.install 2013-06-17 03:30:40 +0000
122@@ -3,7 +3,6 @@
123 debian/nautilus-folder-handler.desktop usr/share/applications
124 usr/bin
125 usr/lib/nautilus/nautilus-convert-metadata
126-usr/lib/nautilus/nautilus-shell-search-provider
127 usr/lib/nautilus/extensions-3.0/*.so
128 usr/share/applications
129 usr/share/dbus-1
130
131=== removed file 'debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch'
132--- debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch 2013-06-10 16:47:24 +0000
133+++ debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch 1970-01-01 00:00:00 +0000
134@@ -1,25 +0,0 @@
135-From 3d278607782dffa724d91680f4278273583e3962 Mon Sep 17 00:00:00 2001
136-From: Pavel Vasin <rat4vier@gmail.com>
137-Date: Tue, 1 Jan 2013 15:53:26 +0400
138-Subject: [PATCH] trash-bar: fix double disconnect handler
139-
140-https://bugzilla.gnome.org/show_bug.cgi?id=691004
141----
142- src/nautilus-trash-bar.c | 1 +
143- 1 file changed, 1 insertion(+)
144-
145-diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
146-index 753de57..c41f48b 100644
147---- a/src/nautilus-trash-bar.c
148-+++ b/src/nautilus-trash-bar.c
149-@@ -107,6 +107,7 @@ nautilus_trash_bar_dispose (GObject *obj)
150-
151- if (bar->priv->selection_handler_id) {
152- g_signal_handler_disconnect (bar->priv->view, bar->priv->selection_handler_id);
153-+ bar->priv->selection_handler_id = 0;
154- }
155-
156- G_OBJECT_CLASS (nautilus_trash_bar_parent_class)->dispose (obj);
157---
158-1.8.3
159-
160
161=== modified file 'debian/patches/06_never_exec_nonexec_launchers.patch'
162--- debian/patches/06_never_exec_nonexec_launchers.patch 2012-08-08 08:29:34 +0000
163+++ debian/patches/06_never_exec_nonexec_launchers.patch 2013-06-17 03:30:40 +0000
164@@ -3,11 +3,11 @@
165 https://wiki.ubuntu.com/SecurityTeam/Policies#Execute-Permission%20Bit%20Required
166 Author: Kees Cook <kees@ubuntu.com>
167
168-Index: nautilus-3.5.5/src/nautilus-mime-actions.c
169+Index: nautilus-3.7.2/src/nautilus-mime-actions.c
170 ===================================================================
171---- nautilus-3.5.5.orig/src/nautilus-mime-actions.c 2012-07-02 18:16:48.000000000 +0200
172-+++ nautilus-3.5.5/src/nautilus-mime-actions.c 2012-08-08 09:41:29.943206858 +0200
173-@@ -1553,12 +1553,14 @@
174+--- nautilus-3.7.2.orig/src/nautilus-mime-actions.c 2012-11-16 03:54:24.000000000 +1300
175++++ nautilus-3.7.2/src/nautilus-mime-actions.c 2012-11-27 12:40:56.976344888 +1300
176+@@ -1562,12 +1562,14 @@
177 "text", primary,
178 "secondary-text", secondary,
179 NULL);
180@@ -22,4 +22,3 @@
181 gtk_dialog_add_button (GTK_DIALOG (dialog),
182 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
183 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
184-
185
186=== removed file 'debian/patches/09_no-initial-fade.patch'
187--- debian/patches/09_no-initial-fade.patch 2012-10-29 00:09:57 +0000
188+++ debian/patches/09_no-initial-fade.patch 1970-01-01 00:00:00 +0000
189@@ -1,18 +0,0 @@
190-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=575964
191-# Patch: http://bugzilla.gnome.org/attachment.cgi?id=130970&action=view
192-# Description: remove initial background fade-in
193-#
194-#
195-Index: nautilus-3.5.5/libnautilus-private/nautilus-desktop-background.c
196-===================================================================
197---- nautilus-3.5.5.orig/libnautilus-private/nautilus-desktop-background.c 2012-08-07 17:53:26.000000000 +0200
198-+++ nautilus-3.5.5/libnautilus-private/nautilus-desktop-background.c 2012-08-08 09:41:30.007206861 +0200
199-@@ -394,8 +394,6 @@
200- self->details->screen_monitors_handler =
201- g_signal_connect (screen, "monitors-changed",
202- G_CALLBACK (screen_size_changed), self);
203--
204-- init_fade (self);
205- nautilus_desktop_background_set_up_widget (self);
206- }
207-
208
209=== modified file 'debian/patches/12_unity_launcher_support.patch'
210--- debian/patches/12_unity_launcher_support.patch 2013-03-12 18:26:02 +0000
211+++ debian/patches/12_unity_launcher_support.patch 2013-06-17 03:30:40 +0000
212@@ -1,18 +1,18 @@
213-=== modified file 'configure.in'
214-Index: nautilus/configure.in
215+=== modified file 'configure.ac'
216+Index: nautilus-3.8.1/configure.ac
217 ===================================================================
218---- nautilus.orig/configure.in 2013-03-12 17:57:43.417743091 +0100
219-+++ nautilus/configure.in 2013-03-12 17:57:43.413743092 +0100
220-@@ -10,6 +10,8 @@
221- m4_define(exif_minver, 0.6.20)
222+--- nautilus-3.8.1.orig/configure.ac 2013-06-04 22:54:22.616331061 -0400
223++++ nautilus-3.8.1/configure.ac 2013-06-04 22:54:22.608331062 -0400
224+@@ -11,6 +11,8 @@
225 m4_define(exempi_minver, 2.1.0)
226 m4_define(notify_minver, 0.7.0)
227+ m4_define(schemas_minver, 3.8.0)
228 +m4_define(unity_minver, 4.0.0)
229 +m4_define(dbusmenu_minver, 0.4.90)
230
231-
232 dnl 1. If the library code has changed at all since last release, then increment revision.
233-@@ -191,6 +193,29 @@
234+ dnl 2. If any interfaces have been added, then increment current and set revision to 0.
235+@@ -193,6 +195,29 @@
236
237 dnl ==========================================================================
238
239@@ -42,7 +42,7 @@
240 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
241
242 WARNING_CFLAGS=""
243-@@ -345,6 +370,7 @@
244+@@ -333,6 +358,7 @@
245 libexif support: ${enable_exif}
246 libexempi support: ${enable_xmp}
247 PackageKit support: $msg_packagekit
248@@ -50,10 +50,10 @@
249 nautilus-sendto ext: $enable_nst_extension
250 Tracker support: $enable_tracker
251
252-Index: nautilus/libnautilus-private/nautilus-progress-info.c
253+Index: nautilus-3.8.1/libnautilus-private/nautilus-progress-info.c
254 ===================================================================
255---- nautilus.orig/libnautilus-private/nautilus-progress-info.c 2013-03-12 17:57:43.417743091 +0100
256-+++ nautilus/libnautilus-private/nautilus-progress-info.c 2013-03-12 17:57:43.413743092 +0100
257+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-progress-info.c 2013-06-04 22:54:22.616331061 -0400
258++++ nautilus-3.8.1/libnautilus-private/nautilus-progress-info.c 2013-06-04 22:54:22.608331062 -0400
259 @@ -52,6 +52,8 @@
260 char *status;
261 char *details;
262@@ -115,10 +115,10 @@
263 info->progress_at_idle = TRUE;
264 queue_idle (info, FALSE);
265 }
266-Index: nautilus/libnautilus-private/nautilus-progress-info.h
267+Index: nautilus-3.8.1/libnautilus-private/nautilus-progress-info.h
268 ===================================================================
269---- nautilus.orig/libnautilus-private/nautilus-progress-info.h 2013-03-12 17:57:43.417743091 +0100
270-+++ nautilus/libnautilus-private/nautilus-progress-info.h 2013-03-12 17:57:43.413743092 +0100
271+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-progress-info.h 2013-06-04 22:54:22.616331061 -0400
272++++ nautilus-3.8.1/libnautilus-private/nautilus-progress-info.h 2013-06-04 22:54:22.608331062 -0400
273 @@ -62,6 +62,8 @@
274 gboolean nautilus_progress_info_get_is_started (NautilusProgressInfo *info);
275 gboolean nautilus_progress_info_get_is_finished (NautilusProgressInfo *info);
276@@ -128,19 +128,19 @@
277
278 void nautilus_progress_info_start (NautilusProgressInfo *info);
279 void nautilus_progress_info_finish (NautilusProgressInfo *info);
280-Index: nautilus/src/Makefile.am
281+Index: nautilus-3.8.1/src/Makefile.am
282 ===================================================================
283---- nautilus.orig/src/Makefile.am 2013-03-12 17:57:43.417743091 +0100
284-+++ nautilus/src/Makefile.am 2013-03-12 17:57:43.413743092 +0100
285-@@ -31,6 +31,7 @@
286+--- nautilus-3.8.1.orig/src/Makefile.am 2013-06-04 22:54:22.616331061 -0400
287++++ nautilus-3.8.1/src/Makefile.am 2013-06-04 22:54:22.608331062 -0400
288+@@ -29,6 +29,7 @@
289 -DSYSCONFDIR=\""$(sysconfdir)"\" \
290 -DVERSION="\"$(VERSION)\"" \
291- $(DISABLE_DEPRECATED_CFLAGS) \
292+ $(DISABLE_DEPRECATED) \
293 + $(UNITY_CFLAGS) \
294 $(NULL)
295
296 LDADD =\
297-@@ -42,6 +43,7 @@
298+@@ -40,6 +41,7 @@
299 $(EXIF_LIBS) \
300 $(EXEMPI_LIBS) \
301 $(POPT_LIBS) \
302@@ -159,10 +159,10 @@
303 $(NULL)
304
305 nodist_nautilus_SOURCES = \
306-Index: nautilus/src/nautilus-progress-ui-handler.c
307+Index: nautilus-3.8.1/src/nautilus-progress-ui-handler.c
308 ===================================================================
309---- nautilus.orig/src/nautilus-progress-ui-handler.c 2013-03-12 17:57:43.417743091 +0100
310-+++ nautilus/src/nautilus-progress-ui-handler.c 2013-03-12 17:57:43.413743092 +0100
311+--- nautilus-3.8.1.orig/src/nautilus-progress-ui-handler.c 2013-06-04 22:54:22.616331061 -0400
312++++ nautilus-3.8.1/src/nautilus-progress-ui-handler.c 2013-06-04 22:54:22.608331062 -0400
313 @@ -38,6 +38,11 @@
314
315 #include <libnotify/notify.h>
316@@ -185,7 +185,7 @@
317 };
318
319 G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);
320-@@ -181,6 +189,221 @@
321+@@ -183,6 +191,221 @@
322 gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
323 }
324
325@@ -407,7 +407,7 @@
326 static gboolean
327 progress_window_delete_event (GtkWidget *widget,
328 GdkEvent *event,
329-@@ -313,6 +536,10 @@
330+@@ -317,6 +540,10 @@
331 progress_ui_handler_show_complete_notification (self);
332 }
333 }
334@@ -418,7 +418,7 @@
335 }
336
337 static void
338-@@ -335,6 +562,10 @@
339+@@ -339,6 +566,10 @@
340 progress_ui_handler_update_notification_or_status (self);
341 }
342 }
343@@ -429,10 +429,10 @@
344 }
345
346 typedef struct {
347-Index: nautilus/src/unity-quicklist-handler.c
348+Index: nautilus-3.8.1/src/unity-quicklist-handler.c
349 ===================================================================
350 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
351-+++ nautilus/src/unity-quicklist-handler.c 2013-03-12 17:57:43.413743092 +0100
352++++ nautilus-3.8.1/src/unity-quicklist-handler.c 2013-06-04 22:54:22.608331062 -0400
353 @@ -0,0 +1,153 @@
354 +/*unity-quicklist-handler.c: handle Unity quicklists
355 + *
356@@ -587,10 +587,10 @@
357 + return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL);
358 +}
359 +
360-Index: nautilus/src/unity-quicklist-handler.h
361+Index: nautilus-3.8.1/src/unity-quicklist-handler.h
362 ===================================================================
363 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
364-+++ nautilus/src/unity-quicklist-handler.h 2013-03-12 17:57:43.413743092 +0100
365++++ nautilus-3.8.1/src/unity-quicklist-handler.h 2013-06-04 22:54:22.612331061 -0400
366 @@ -0,0 +1,75 @@
367 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
368 +/*
369@@ -667,10 +667,10 @@
370 +#define UNITY_QUICKLIST_CANCEL_COPY _("Cancel All In-progress Actions")
371 +
372 +#endif /* __UNITY_QUICKLIST_HANDLER_H__ */
373-Index: nautilus/src/nautilus-application.c
374+Index: nautilus-3.8.1/src/nautilus-application.c
375 ===================================================================
376---- nautilus.orig/src/nautilus-application.c 2013-03-12 17:57:43.417743091 +0100
377-+++ nautilus/src/nautilus-application.c 2013-03-12 17:57:43.417743091 +0100
378+--- nautilus-3.8.1.orig/src/nautilus-application.c 2013-06-04 22:54:22.616331061 -0400
379++++ nautilus-3.8.1/src/nautilus-application.c 2013-06-04 22:54:22.612331061 -0400
380 @@ -79,6 +79,10 @@
381 #include <gdk/gdkx.h>
382 #include <gtk/gtk.h>
383@@ -682,8 +682,8 @@
384 /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
385 #define APPLICATION_WINDOW_MIN_WIDTH 300
386 #define APPLICATION_WINDOW_MIN_HEIGHT 100
387-@@ -1548,6 +1552,10 @@
388- nautilus_application_init_actions (self);
389+@@ -1646,6 +1650,10 @@
390+ init_desktop (self);
391
392 nautilus_profile_end (NULL);
393 +
394@@ -693,11 +693,11 @@
395 }
396
397 static void
398-Index: nautilus/src/unity-bookmarks-handler.c
399+Index: nautilus-3.8.1/src/unity-bookmarks-handler.c
400 ===================================================================
401 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
402-+++ nautilus/src/unity-bookmarks-handler.c 2013-03-12 18:57:09.410958729 +0100
403-@@ -0,0 +1,144 @@
404++++ nautilus-3.8.1/src/unity-bookmarks-handler.c 2013-06-04 22:54:36.572330478 -0400
405+@@ -0,0 +1,140 @@
406 +/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist
407 + *
408 + * Copyright (C) 2012 Canonical
409@@ -802,10 +802,6 @@
410 +
411 + bookmark = nautilus_bookmark_list_item_at (bookmarks, index);
412 +
413-+ if (nautilus_bookmark_uri_known_not_to_exist (bookmark)) {
414-+ continue;
415-+ }
416-+
417 + for (l = unity_quicklist_get_launcher_entries (unity_quicklist_handler); l; l = l->next) {
418 + UnityLauncherEntry *entry = l->data;
419 +
420@@ -842,10 +838,10 @@
421 + G_CALLBACK (unity_bookmarks_handler_refresh_bookmarks), 0);
422 +}
423 +
424-Index: nautilus/src/unity-bookmarks-handler.h
425+Index: nautilus-3.8.1/src/unity-bookmarks-handler.h
426 ===================================================================
427 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
428-+++ nautilus/src/unity-bookmarks-handler.h 2013-03-12 17:57:43.417743091 +0100
429++++ nautilus-3.8.1/src/unity-bookmarks-handler.h 2013-06-04 22:54:22.612331061 -0400
430 @@ -0,0 +1,31 @@
431 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
432 +/*
433@@ -878,10 +874,10 @@
434 +void unity_bookmarks_handler_initialize (void);
435 +
436 +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/
437-Index: nautilus/po/POTFILES.in
438+Index: nautilus-3.8.1/po/POTFILES.in
439 ===================================================================
440---- nautilus.orig/po/POTFILES.in 2013-03-12 17:57:43.417743091 +0100
441-+++ nautilus/po/POTFILES.in 2013-03-12 17:57:43.417743091 +0100
442+--- nautilus-3.8.1.orig/po/POTFILES.in 2013-06-04 22:54:22.616331061 -0400
443++++ nautilus-3.8.1/po/POTFILES.in 2013-06-04 22:54:22.612331061 -0400
444 @@ -90,3 +90,4 @@
445 src/nautilus-window-private.h
446 src/nautilus-window-slot.c
447
448=== modified file 'debian/patches/15_use-ubuntu-help.patch'
449--- debian/patches/15_use-ubuntu-help.patch 2012-11-03 15:59:48 +0000
450+++ debian/patches/15_use-ubuntu-help.patch 2013-06-17 03:30:40 +0000
451@@ -3,10 +3,10 @@
452 Forwarded: Not needed
453 Author: Jeremy Bicha <jbicha@ubuntu.com>
454
455-Index: nautilus-3.6.2/src/nautilus-connect-server-dialog.c
456+Index: nautilus-3.7.2/src/nautilus-connect-server-dialog.c
457 ===================================================================
458---- nautilus-3.6.2.orig/src/nautilus-connect-server-dialog.c 2012-11-02 22:03:55.514929059 -0400
459-+++ nautilus-3.6.2/src/nautilus-connect-server-dialog.c 2012-11-02 22:04:24.466927848 -0400
460+--- nautilus-3.7.2.orig/src/nautilus-connect-server-dialog.c 2012-10-30 12:39:52.000000000 +1300
461++++ nautilus-3.7.2/src/nautilus-connect-server-dialog.c 2012-11-27 12:42:46.844343840 +1300
462 @@ -97,7 +97,12 @@
463 break;
464 case GTK_RESPONSE_HELP:
465@@ -21,10 +21,10 @@
466 "help:gnome-help/nautilus-connect",
467 gtk_get_current_event_time (), &error);
468 if (error) {
469-Index: nautilus-3.6.2/src/nautilus-file-management-properties.c
470+Index: nautilus-3.7.2/src/nautilus-file-management-properties.c
471 ===================================================================
472---- nautilus-3.6.2.orig/src/nautilus-file-management-properties.c 2012-11-02 22:03:55.514929059 -0400
473-+++ nautilus-3.6.2/src/nautilus-file-management-properties.c 2012-11-02 22:04:24.466927848 -0400
474+--- nautilus-3.7.2.orig/src/nautilus-file-management-properties.c 2012-10-30 12:39:52.000000000 +1300
475++++ nautilus-3.7.2/src/nautilus-file-management-properties.c 2012-11-27 12:42:46.844343840 +1300
476 @@ -232,7 +232,10 @@
477 section = "nautilus-preview";
478 break;
479@@ -37,11 +37,11 @@
480 } else if (response_id == GTK_RESPONSE_CLOSE) {
481 gtk_widget_destroy (GTK_WIDGET (parent));
482 }
483-Index: nautilus-3.6.2/src/nautilus-properties-window.c
484+Index: nautilus-3.7.2/src/nautilus-properties-window.c
485 ===================================================================
486---- nautilus-3.6.2.orig/src/nautilus-properties-window.c 2012-11-02 22:03:55.514929059 -0400
487-+++ nautilus-3.6.2/src/nautilus-properties-window.c 2012-11-02 22:08:49.666916757 -0400
488-@@ -3158,7 +3158,11 @@
489+--- nautilus-3.7.2.orig/src/nautilus-properties-window.c 2012-11-14 02:19:44.000000000 +1300
490++++ nautilus-3.7.2/src/nautilus-properties-window.c 2012-11-27 12:42:46.844343840 +1300
491+@@ -3197,7 +3197,11 @@
492 GtkWidget *volume_usage;
493 GtkWidget *hbox, *vbox;
494
495@@ -54,7 +54,7 @@
496 "help:gnome-help/nautilus-file-properties-basic");
497
498 /* Icon pixmap */
499-@@ -4491,10 +4495,16 @@
500+@@ -4532,10 +4536,16 @@
501 char *file_name, *prompt_text;
502 GList *file_list;
503
504@@ -72,7 +72,7 @@
505 file_list = window->details->original_files;
506
507 window->details->initial_permissions = NULL;
508-@@ -4791,7 +4801,11 @@
509+@@ -4832,7 +4842,11 @@
510 g_free (mime_type);
511 g_list_free (files);
512
513@@ -85,7 +85,7 @@
514 gtk_notebook_append_page (window->details->notebook,
515 vbox, gtk_label_new (_("Open With")));
516 }
517-@@ -5143,10 +5157,18 @@
518+@@ -5184,10 +5198,18 @@
519 curpage = gtk_notebook_get_nth_page (window->details->notebook,
520 gtk_notebook_get_current_page (window->details->notebook));
521 helpuri = g_object_get_data (G_OBJECT (curpage), "help-uri");
522@@ -105,11 +105,11 @@
523 if (error != NULL) {
524 eel_show_error_dialog (_("There was an error displaying help."), error->message,
525 GTK_WINDOW (dialog));
526-Index: nautilus-3.6.2/src/nautilus-view.c
527+Index: nautilus-3.7.2/src/nautilus-view.c
528 ===================================================================
529---- nautilus-3.6.2.orig/src/nautilus-view.c 2012-11-02 22:03:55.514929059 -0400
530-+++ nautilus-3.6.2/src/nautilus-view.c 2012-11-02 22:04:24.474927848 -0400
531-@@ -1434,7 +1434,12 @@
532+--- nautilus-3.7.2.orig/src/nautilus-view.c 2012-11-27 12:41:58.000000000 +1300
533++++ nautilus-3.7.2/src/nautilus-view.c 2012-11-27 12:42:46.848343840 +1300
534+@@ -1431,7 +1431,12 @@
535 break;
536 case GTK_RESPONSE_HELP :
537 error = NULL;
538@@ -123,11 +123,11 @@
539 "help:gnome-help/files-select",
540 gtk_get_current_event_time (), &error);
541 if (error) {
542-Index: nautilus-3.6.2/src/nautilus-window-menus.c
543+Index: nautilus-3.7.2/src/nautilus-window-menus.c
544 ===================================================================
545---- nautilus-3.6.2.orig/src/nautilus-window-menus.c 2012-11-02 22:03:55.514929059 -0400
546-+++ nautilus-3.6.2/src/nautilus-window-menus.c 2012-11-02 22:04:24.474927848 -0400
547-@@ -221,31 +221,39 @@
548+--- nautilus-3.7.2.orig/src/nautilus-window-menus.c 2012-11-20 10:20:41.000000000 +1300
549++++ nautilus-3.7.2/src/nautilus-window-menus.c 2012-11-27 12:42:46.848343840 +1300
550+@@ -220,31 +220,39 @@
551 GError *error;
552 GtkWidget *dialog;
553 const char* helpuri;
554@@ -173,17 +173,15 @@
555 if (error) {
556 dialog = gtk_message_dialog_new (GTK_WINDOW (window),
557 GTK_DIALOG_MODAL,
558-Index: nautilus-3.6.2/src/nautilus-application.c
559+Index: nautilus-3.7.2/src/nautilus-application.c
560 ===================================================================
561---- nautilus-3.6.2.orig/src/nautilus-application.c 2012-11-02 22:03:55.514929059 -0400
562-+++ nautilus-3.6.2/src/nautilus-application.c 2012-11-02 22:04:24.474927848 -0400
563-@@ -874,8 +874,15 @@
564- GtkApplication *application = user_data;
565+--- nautilus-3.7.2.orig/src/nautilus-application.c 2012-11-27 12:42:33.680343967 +1300
566++++ nautilus-3.7.2/src/nautilus-application.c 2012-11-27 12:42:46.848343840 +1300
567+@@ -860,7 +860,14 @@
568 GError *error = NULL;
569
570-- window = get_focus_window (application);
571+ window = gtk_application_get_active_window (application);
572 - gtk_show_uri (window ?
573-+ window = get_focus_window (application);
574 + if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
575 + gtk_show_uri (window ?
576 + gtk_window_get_screen (GTK_WINDOW (window)) :
577
578=== modified file 'debian/patches/17_static_unity_quicklist.patch'
579--- debian/patches/17_static_unity_quicklist.patch 2013-03-12 18:26:02 +0000
580+++ debian/patches/17_static_unity_quicklist.patch 2013-06-17 03:30:40 +0000
581@@ -1,11 +1,11 @@
582-Index: nautilus/data/nautilus.desktop.in.in
583+Index: nautilus-3.7.2/data/nautilus.desktop.in.in
584 ===================================================================
585---- nautilus.orig/data/nautilus.desktop.in.in 2013-03-12 17:08:37.121951465 +0100
586-+++ nautilus/data/nautilus.desktop.in.in 2013-03-12 17:11:35.029894735 +0100
587+--- nautilus-3.7.2.orig/data/nautilus.desktop.in.in 2012-11-14 02:19:44.000000000 +1300
588++++ nautilus-3.7.2/data/nautilus.desktop.in.in 2012-11-27 12:42:49.748343814 +1300
589 @@ -14,3 +14,9 @@
590- X-GNOME-Bugzilla-Product=nautilus
591 X-GNOME-Bugzilla-Component=general
592 X-GNOME-Bugzilla-Version=@VERSION@
593+ X-GNOME-UsesNotifications=true
594 +Actions=Window;
595 +
596 +[Desktop Action Window]
597
598=== modified file 'debian/patches/18_unity_icon_color.patch'
599--- debian/patches/18_unity_icon_color.patch 2013-03-08 13:44:44 +0000
600+++ debian/patches/18_unity_icon_color.patch 2013-06-17 03:30:40 +0000
601@@ -1,10 +1,10 @@
602-Index: nautilus-3.6.3/data/nautilus.desktop.in.in
603+Index: nautilus-3.8.1/data/nautilus.desktop.in.in
604 ===================================================================
605---- nautilus-3.6.3.orig/data/nautilus.desktop.in.in 2013-03-08 11:22:36.712732149 +0100
606-+++ nautilus-3.6.3/data/nautilus.desktop.in.in 2013-03-08 11:23:04.052733060 +0100
607-@@ -14,6 +14,7 @@
608- X-GNOME-Bugzilla-Component=general
609+--- nautilus-3.8.1.orig/data/nautilus.desktop.in.in 2013-06-04 22:27:44.308397907 -0400
610++++ nautilus-3.8.1/data/nautilus.desktop.in.in 2013-06-04 22:27:44.304397907 -0400
611+@@ -16,6 +16,7 @@
612 X-GNOME-Bugzilla-Version=@VERSION@
613+ X-GNOME-UsesNotifications=true
614 Actions=Window;
615 +X-Unity-IconBackgroundColor=#af4853
616
617
618=== modified file 'debian/patches/19_unity_open_location_xid.patch'
619--- debian/patches/19_unity_open_location_xid.patch 2013-03-27 18:56:42 +0000
620+++ debian/patches/19_unity_open_location_xid.patch 2013-06-17 03:30:40 +0000
621@@ -1,7 +1,15 @@
622+Description: Add a new dbus property to the nautilus'
623+ "org.freedesktop.FileManager1" dbus interface where it stores the lists of
624+ opened locations referenced by their parent nautilus window XID.
625+
626+Bug-Ubuntu: https://bugs.launchpad.net/unity/+bug/887449
627+Forwarded: no
628+Author: Marco Trevisan <marco@ubuntu.com>
629+
630 Index: nautilus/data/freedesktop-dbus-interfaces.xml
631 ===================================================================
632---- nautilus.orig/data/freedesktop-dbus-interfaces.xml 2013-03-27 15:18:14.620455679 +0100
633-+++ nautilus/data/freedesktop-dbus-interfaces.xml 2013-03-27 15:18:36.812457731 +0100
634+--- nautilus.orig/data/freedesktop-dbus-interfaces.xml 2013-06-10 21:00:24.913944953 +0200
635++++ nautilus/data/freedesktop-dbus-interfaces.xml 2013-06-10 21:00:24.905944954 +0200
636 @@ -33,5 +33,6 @@
637 <arg type='s' name='StartupId' direction='in'/>
638 </method>
639@@ -11,9 +19,9 @@
640 </node>
641 Index: nautilus/src/nautilus-application.c
642 ===================================================================
643---- nautilus.orig/src/nautilus-application.c 2013-03-27 14:24:02.345633000 +0100
644-+++ nautilus/src/nautilus-application.c 2013-03-27 17:22:49.598601760 +0100
645-@@ -1589,6 +1589,11 @@
646+--- nautilus.orig/src/nautilus-application.c 2013-06-10 21:00:24.913944953 +0200
647++++ nautilus/src/nautilus-application.c 2013-06-10 21:00:24.905944954 +0200
648+@@ -1672,6 +1672,11 @@
649
650 g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
651
652@@ -25,7 +33,7 @@
653 for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = l->next) {
654 NautilusWindow *win = NAUTILUS_WINDOW (l->data);
655
656-@@ -1596,11 +1601,15 @@
657+@@ -1679,11 +1684,15 @@
658 continue;
659 }
660
661@@ -41,7 +49,7 @@
662 GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
663
664 if (!found) {
665-@@ -1611,6 +1620,17 @@
666+@@ -1694,6 +1703,17 @@
667 }
668 }
669 }
670@@ -59,15 +67,16 @@
671 }
672
673 locations_array = g_new (gchar*, locations_size + 1);
674-@@ -1623,6 +1643,7 @@
675- locations_array[locations_size] = NULL;
676+@@ -1707,6 +1727,8 @@
677
678- nautilus_freedesktop_dbus_set_open_locations ((const gchar**) locations_array);
679-+ nautilus_freedesktop_dbus_set_open_locations_xids (g_variant_builder_end (&b));
680+ nautilus_freedesktop_dbus_set_open_locations (app->priv->fdb_manager,
681+ (const gchar**) locations_array);
682++ nautilus_freedesktop_dbus_set_open_locations_xids (app->priv->fdb_manager,
683++ g_variant_builder_end (&b));
684
685 g_free (locations_array);
686 g_list_free_full (locations, g_free);
687-@@ -1660,14 +1681,24 @@
688+@@ -1744,14 +1766,24 @@
689 }
690
691 static void
692@@ -94,7 +103,7 @@
693 }
694
695 static void
696-@@ -1685,8 +1716,11 @@
697+@@ -1769,8 +1801,11 @@
698 nautilus_previewer_call_close (previewer);
699 }
700
701@@ -110,31 +119,32 @@
702 static void
703 Index: nautilus/src/nautilus-freedesktop-dbus.c
704 ===================================================================
705---- nautilus.orig/src/nautilus-freedesktop-dbus.c 2013-03-27 14:24:02.345633000 +0100
706-+++ nautilus/src/nautilus-freedesktop-dbus.c 2013-03-27 14:37:39.224743813 +0100
707-@@ -303,6 +303,14 @@
708- nautilus_freedesktop_file_manager1_set_open_locations (singleton->skeleton, locations);
709+--- nautilus.orig/src/nautilus-freedesktop-dbus.c 2013-06-10 21:00:24.913944953 +0200
710++++ nautilus/src/nautilus-freedesktop-dbus.c 2013-06-10 21:01:11.485942497 +0200
711+@@ -229,6 +229,15 @@
712+ nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations);
713 }
714
715 +void
716-+nautilus_freedesktop_dbus_set_open_locations_xids (GVariant *locations)
717++nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb,
718++ GVariant *locations)
719 +{
720-+ g_return_if_fail (singleton);
721++ g_return_if_fail (NAUTILUS_IS_FREEDESKTOP_DBUS (fdb));
722 +
723-+ nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (singleton->skeleton, locations);
724++ nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (fdb->skeleton, locations);
725 +}
726 +
727 /* Tries to own the org.freedesktop.FileManager1 service name */
728- void
729- nautilus_freedesktop_dbus_start (NautilusApplication *app)
730+ NautilusFreedesktopDBus *
731+ nautilus_freedesktop_dbus_new (void)
732 Index: nautilus/src/nautilus-freedesktop-dbus.h
733 ===================================================================
734---- nautilus.orig/src/nautilus-freedesktop-dbus.h 2013-03-27 14:24:02.345633000 +0100
735-+++ nautilus/src/nautilus-freedesktop-dbus.h 2013-03-27 15:17:59.012454136 +0100
736-@@ -28,5 +28,6 @@
737- void nautilus_freedesktop_dbus_start (NautilusApplication *app);
738- void nautilus_freedesktop_dbus_stop (void);
739- void nautilus_freedesktop_dbus_set_open_locations (const gchar **locations);
740-+void nautilus_freedesktop_dbus_set_open_locations_xids (GVariant *locations);
741+--- nautilus.orig/src/nautilus-freedesktop-dbus.h 2013-06-10 21:00:24.913944953 +0200
742++++ nautilus/src/nautilus-freedesktop-dbus.h 2013-06-10 21:00:24.909944954 +0200
743+@@ -48,5 +48,6 @@
744+ NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);
745+
746+ void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations);
747++void nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb, GVariant *locations);
748
749 #endif /* __NAUTILUS_FREEDESKTOP_DBUS_H__ */
750
751=== removed file 'debian/patches/git_add_desktop_keywords.patch'
752--- debian/patches/git_add_desktop_keywords.patch 2013-03-14 10:35:52 +0000
753+++ debian/patches/git_add_desktop_keywords.patch 1970-01-01 00:00:00 +0000
754@@ -1,12 +0,0 @@
755-Index: nautilus/data/nautilus.desktop.in.in
756-===================================================================
757---- nautilus.orig/data/nautilus.desktop.in.in 2013-03-12 19:35:01.714349423 +0100
758-+++ nautilus/data/nautilus.desktop.in.in 2013-03-12 19:37:25.077722944 +0100
759-@@ -1,6 +1,7 @@
760- [Desktop Entry]
761- _Name=Files
762- _Comment=Access and organize files
763-+_Keywords=folder;manager;explore;disk;filesystem;
764- Exec=nautilus --new-window %U
765- Icon=system-file-manager
766- Terminal=false
767
768=== removed file 'debian/patches/git_add_missing_tooltips.patch'
769--- debian/patches/git_add_missing_tooltips.patch 2012-10-31 07:02:17 +0000
770+++ debian/patches/git_add_missing_tooltips.patch 1970-01-01 00:00:00 +0000
771@@ -1,88 +0,0 @@
772-From f017a93b9ba3a465059ebca8eeb79138c983bd96 Mon Sep 17 00:00:00 2001
773-From: Cosimo Cecchi <cosimoc@gnome.org>
774-Date: Fri, 26 Oct 2012 20:43:40 +0000
775-Subject: toolbar: add missing tooltips for toolbar menubuttons
776-
777-These require new strings, so it's a separate commit from the previous
778-one.
779-
780-https://bugzilla.gnome.org/show_bug.cgi?id=686903
781----
782-diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
783-index 94be1c0..fbea52f 100644
784---- a/src/nautilus-toolbar.c
785-+++ b/src/nautilus-toolbar.c
786-@@ -34,6 +34,7 @@
787- #include <libnautilus-private/nautilus-global-preferences.h>
788- #include <libnautilus-private/nautilus-ui-utilities.h>
789-
790-+#include <glib/gi18n.h>
791- #include <math.h>
792-
793- typedef enum {
794-@@ -100,7 +101,8 @@ static GtkWidget *
795- toolbar_create_toolbutton (NautilusToolbar *self,
796- gboolean create_menu,
797- gboolean create_toggle,
798-- const gchar *name)
799-+ const gchar *name,
800-+ const gchar *tooltip)
801- {
802- GtkWidget *button, *image;
803- GtkActionGroup *action_group;
804-@@ -124,6 +126,7 @@ toolbar_create_toolbutton (NautilusToolbar *self,
805- if (create_menu) {
806- gtk_image_set_from_icon_name (GTK_IMAGE (image), name,
807- GTK_ICON_SIZE_MENU);
808-+ gtk_widget_set_tooltip_text (button, tooltip);
809- } else {
810- action = gtk_action_group_get_action (action_group, name);
811- gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
812-@@ -357,12 +360,12 @@ nautilus_toolbar_constructed (GObject *obj)
813- box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
814-
815- /* Back */
816-- tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_BACK);
817-+ tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_BACK, NULL);
818- navigation_button_setup_menu (self, tool_button, NAUTILUS_NAVIGATION_DIRECTION_BACK);
819- gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
820-
821- /* Forward */
822-- tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_FORWARD);
823-+ tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_FORWARD, NULL);
824- navigation_button_setup_menu (self, tool_button, NAUTILUS_NAVIGATION_DIRECTION_FORWARD);
825- gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
826-
827-@@ -396,7 +399,7 @@ nautilus_toolbar_constructed (GObject *obj)
828-
829- /* search */
830- tool_item = gtk_tool_item_new ();
831-- tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_SEARCH);
832-+ tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_SEARCH, NULL);
833- gtk_container_add (GTK_CONTAINER (tool_item), GTK_WIDGET (tool_button));
834- gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (tool_item));
835- gtk_widget_show_all (GTK_WIDGET (tool_item));
836-@@ -406,11 +409,11 @@ nautilus_toolbar_constructed (GObject *obj)
837- tool_item = gtk_tool_item_new ();
838- box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
839-
840-- tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_LIST);
841-+ tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_LIST, NULL);
842- gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
843-- tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_GRID);
844-+ tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_GRID, NULL);
845- gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
846-- tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "go-down-symbolic");
847-+ tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "go-down-symbolic", _("View options"));
848- gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
849- menu = gtk_ui_manager_get_widget (ui_manager, "/ViewMenu");
850- gtk_menu_button_set_popup (GTK_MENU_BUTTON (tool_button), menu);
851-@@ -427,7 +430,7 @@ nautilus_toolbar_constructed (GObject *obj)
852-
853- /* Action Menu */
854- tool_item = gtk_tool_item_new ();
855-- tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "emblem-system-symbolic");
856-+ tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "emblem-system-symbolic", _("Location options"));
857- menu = gtk_ui_manager_get_widget (ui_manager, "/ActionMenu");
858- gtk_widget_set_halign (menu, GTK_ALIGN_END);
859- gtk_menu_button_set_popup (GTK_MENU_BUTTON (tool_button), menu);
860
861=== removed file 'debian/patches/git_eel_needs_terminal.patch'
862--- debian/patches/git_eel_needs_terminal.patch 2013-05-28 10:48:02 +0000
863+++ debian/patches/git_eel_needs_terminal.patch 1970-01-01 00:00:00 +0000
864@@ -1,175 +0,0 @@
865-From 447d2ad6944afd94434a774b28f8c6e8274955fe Mon Sep 17 00:00:00 2001
866-From: William Jon McCann <jmccann@redhat.com>
867-Date: Fri, 15 Feb 2013 18:30:39 +0000
868-Subject: eel: use G_APP_INFO_CREATE_NEEDS_TERMINAL to run command in terminal
869-
870----
871-diff --git a/eel/eel-gnome-extensions.c b/eel/eel-gnome-extensions.c
872-index eaddfe5..e7b8ecb 100644
873---- a/eel/eel-gnome-extensions.c
874-+++ b/eel/eel-gnome-extensions.c
875-@@ -31,153 +31,19 @@
876- #include "eel-gnome-extensions.h"
877-
878- #include <gtk/gtk.h>
879--#include <libgnome-desktop/gnome-desktop-utils.h>
880-
881- /* Return a command string containing the path to a terminal on this system. */
882-
883--static char *
884--try_terminal_command (const char *program,
885-- const char *args)
886--{
887-- char *program_in_path, *quoted, *result;
888--
889-- if (program == NULL) {
890-- return NULL;
891-- }
892--
893-- program_in_path = g_find_program_in_path (program);
894-- if (program_in_path == NULL) {
895-- return NULL;
896-- }
897--
898-- quoted = g_shell_quote (program_in_path);
899-- g_free (program_in_path);
900-- if (args == NULL || args[0] == '\0') {
901-- return quoted;
902-- }
903-- result = g_strconcat (quoted, " ", args, NULL);
904-- g_free (quoted);
905-- return result;
906--}
907--
908--static char *
909--try_terminal_command_argv (int argc,
910-- char **argv)
911--{
912-- GString *string;
913-- int i;
914-- char *quoted, *result;
915--
916-- if (argc == 0) {
917-- return NULL;
918-- }
919--
920-- if (argc == 1) {
921-- return try_terminal_command (argv[0], NULL);
922-- }
923--
924-- string = g_string_new (argv[1]);
925-- for (i = 2; i < argc; i++) {
926-- quoted = g_shell_quote (argv[i]);
927-- g_string_append_c (string, ' ');
928-- g_string_append (string, quoted);
929-- g_free (quoted);
930-- }
931-- result = try_terminal_command (argv[0], string->str);
932-- g_string_free (string, TRUE);
933--
934-- return result;
935--}
936--
937--static char *
938--get_terminal_command_prefix (gboolean for_command)
939--{
940-- int argc;
941-- char **argv;
942-- char *command;
943-- guint i;
944-- static const char *const commands[][3] = {
945-- { "gnome-terminal", "-x", "" },
946-- { "dtterm", "-e", "-ls" },
947-- { "nxterm", "-e", "-ls" },
948-- { "color-xterm", "-e", "-ls" },
949-- { "rxvt", "-e", "-ls" },
950-- { "xterm", "-e", "-ls" },
951-- };
952--
953-- /* Try the terminal from preferences. Use without any
954-- * arguments if we are just doing a standalone terminal.
955-- */
956-- argc = 0;
957-- argv = g_new0 (char *, 1);
958-- gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
959--
960-- command = NULL;
961-- if (argc != 0) {
962-- if (for_command) {
963-- command = try_terminal_command_argv (argc, argv);
964-- } else {
965-- /* Strip off the arguments in a lame attempt
966-- * to make it be an interactive shell.
967-- */
968-- command = try_terminal_command (argv[0], NULL);
969-- }
970-- }
971--
972-- while (argc != 0) {
973-- g_free (argv[--argc]);
974-- }
975-- g_free (argv);
976--
977-- if (command != NULL) {
978-- return command;
979-- }
980--
981-- /* Try well-known terminal applications in same order that gmc did. */
982-- for (i = 0; i < G_N_ELEMENTS (commands); i++) {
983-- command = try_terminal_command (commands[i][0],
984-- commands[i][for_command ? 1 : 2]);
985-- if (command != NULL) {
986-- break;
987-- }
988-- }
989--
990-- return command;
991--}
992--
993--static char *
994--eel_gnome_make_terminal_command (const char *command)
995--{
996-- char *prefix, *quoted, *terminal_command;
997--
998-- if (command == NULL) {
999-- return get_terminal_command_prefix (FALSE);
1000-- }
1001-- prefix = get_terminal_command_prefix (TRUE);
1002-- quoted = g_shell_quote (command);
1003-- terminal_command = g_strconcat (prefix, " /bin/sh -c ", quoted, NULL);
1004-- g_free (prefix);
1005-- g_free (quoted);
1006-- return terminal_command;
1007--}
1008--
1009- void
1010- eel_gnome_open_terminal_on_screen (const char *command,
1011- GdkScreen *screen)
1012- {
1013-- char *command_line;
1014- GAppInfo *app;
1015- GdkAppLaunchContext *ctx;
1016- GError *error = NULL;
1017- GdkDisplay *display;
1018-
1019-- command_line = eel_gnome_make_terminal_command (command);
1020-- if (command_line == NULL) {
1021-- g_message ("Could not start a terminal");
1022-- return;
1023-- }
1024--
1025-- app = g_app_info_create_from_commandline (command_line, NULL, 0, &error);
1026-+ app = g_app_info_create_from_commandline (command, NULL, G_APP_INFO_CREATE_NEEDS_TERMINAL, &error);
1027-
1028- if (app != NULL && screen != NULL) {
1029- display = gdk_screen_get_display (screen);
1030-@@ -195,6 +61,4 @@ eel_gnome_open_terminal_on_screen (const char *command,
1031-
1032- g_error_free (error);
1033- }
1034--
1035-- g_free (command_line);
1036- }
1037---
1038-cgit v0.9.1
1039-
1040
1041=== removed file 'debian/patches/git_enable_copy_from_recent.patch'
1042--- debian/patches/git_enable_copy_from_recent.patch 2013-04-04 23:22:13 +0000
1043+++ debian/patches/git_enable_copy_from_recent.patch 1970-01-01 00:00:00 +0000
1044@@ -1,58 +0,0 @@
1045-From b61e1d03b42723e13cf7dd05a26c9bd92dbac0ce Mon Sep 17 00:00:00 2001
1046-From: Cosimo Cecchi <cosimoc@gnome.org>
1047-Date: Wed, 03 Apr 2013 22:08:09 +0000
1048-Subject: view: allow copying, and not cutting, from Recent Files
1049-
1050-Previously, we enabled the Cut action for the Recent location, and kept
1051-Copy and Copy To disabled. This should be the other way around, as
1052-copying a file from there is a valid option, whereas cutting/moving it
1053-doesn't make sense, being a virtual location.
1054-
1055-https://bugzilla.gnome.org/show_bug.cgi?id=690138
1056----
1057-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
1058-index 6b1bed2..357da27 100644
1059---- a/src/nautilus-view.c
1060-+++ b/src/nautilus-view.c
1061-@@ -8386,6 +8386,7 @@ real_update_menus (NautilusView *view)
1062- gboolean selection_contains_recent;
1063- gboolean can_create_files;
1064- gboolean can_delete_files;
1065-+ gboolean can_move_files;
1066- gboolean can_trash_files;
1067- gboolean can_copy_files;
1068- gboolean can_link_files;
1069-@@ -8422,9 +8423,9 @@ real_update_menus (NautilusView *view)
1070- !selection_contains_special_link &&
1071- !selection_contains_desktop_or_home_dir;
1072- can_copy_files = selection_count != 0
1073-- && !selection_contains_recent
1074- && !selection_contains_special_link;
1075-
1076-+ can_move_files = can_delete_files && !selection_contains_recent;
1077- can_link_files = can_create_files && can_copy_files;
1078-
1079- action = gtk_action_group_get_action (view->details->dir_action_group,
1080-@@ -8717,7 +8718,7 @@ real_update_menus (NautilusView *view)
1081-
1082- action = gtk_action_group_get_action (view->details->dir_action_group,
1083- NAUTILUS_ACTION_CUT);
1084-- gtk_action_set_sensitive (action, can_delete_files);
1085-+ gtk_action_set_sensitive (action, can_move_files);
1086- gtk_action_set_visible (action, !selection_contains_recent);
1087-
1088- action = gtk_action_group_get_action (view->details->dir_action_group,
1089-@@ -8749,10 +8750,10 @@ real_update_menus (NautilusView *view)
1090- action = gtk_action_group_get_action (view->details->dir_action_group,
1091- NAUTILUS_ACTION_COPY_TO);
1092- gtk_action_set_sensitive (action, can_copy_files);
1093-- gtk_action_set_visible (action, !selection_contains_recent);
1094-+
1095- action = gtk_action_group_get_action (view->details->dir_action_group,
1096- NAUTILUS_ACTION_MOVE_TO);
1097-- gtk_action_set_sensitive (action, can_delete_files);
1098-+ gtk_action_set_sensitive (action, can_move_files);
1099- gtk_action_set_visible (action, !selection_contains_recent);
1100-
1101- action = gtk_action_group_get_action (view->details->dir_action_group, NAUTILUS_ACTION_SHOW_HIDDEN_FILES);
1102-
1103
1104=== removed file 'debian/patches/git_enable_simple_search_engine.patch'
1105--- debian/patches/git_enable_simple_search_engine.patch 2013-03-22 17:44:56 +0000
1106+++ debian/patches/git_enable_simple_search_engine.patch 1970-01-01 00:00:00 +0000
1107@@ -1,31 +0,0 @@
1108-From f65d3e15916a12fe2fe35b63e862b9f9d20920bf Mon Sep 17 00:00:00 2001
1109-From: Cosimo Cecchi <cosimoc@gnome.org>
1110-Date: Mon, 22 Oct 2012 22:59:38 +0000
1111-Subject: search-directory: always start the simple engine
1112-
1113-This is needed to load results incrementally, which will be done in a
1114-separate commit.
1115-
1116-https://bugzilla.gnome.org/show_bug.cgi?id=325146
1117----
1118-diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
1119-index fbeabe0..c92b745 100644
1120---- a/libnautilus-private/nautilus-search-engine.c
1121-+++ b/libnautilus-private/nautilus-search-engine.c
1122-@@ -92,10 +92,10 @@ search_engine_start_real (NautilusSearchEngine *engine)
1123- if (nautilus_search_engine_model_get_model (engine->details->model)) {
1124- nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->model));
1125- engine->details->providers_running++;
1126-- } else {
1127-- nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->simple));
1128-- engine->details->providers_running++;
1129- }
1130-+
1131-+ nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->simple));
1132-+ engine->details->providers_running++;
1133- }
1134-
1135- static void
1136---
1137-cgit v0.9.1
1138-
1139
1140=== removed file 'debian/patches/git_export_opened_locations_on_dbus.patch'
1141--- debian/patches/git_export_opened_locations_on_dbus.patch 2013-03-14 10:35:52 +0000
1142+++ debian/patches/git_export_opened_locations_on_dbus.patch 1970-01-01 00:00:00 +0000
1143@@ -1,261 +0,0 @@
1144-Description: Add a new dbus property to the nautilus'
1145- "org.freedesktop.FileManager1" dbus interface where it stores a list of
1146- currently opened locations.
1147-
1148-Origin: upstream, https://git.gnome.org/browse/nautilus/commit/?id=e6fecc0500b83
1149- https://git.gnome.org/browse/nautilus/commit/?id=980512c
1150- https://git.gnome.org/browse/nautilus/commit/?id=49115b85
1151- https://git.gnome.org/browse/nautilus/commit/?id=b8eebe95
1152-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694266
1153-Bug-Ubuntu: https://bugs.launchpad.net/nautilus/+bug/1063830
1154-Forwarded: yes
1155-Applied-Upstream: 3.7.91
1156-Author: Marco Trevisan <marco@ubuntu.com>
1157-
1158-Index: nautilus/src/nautilus-application.c
1159-===================================================================
1160---- nautilus.orig/src/nautilus-application.c 2013-03-13 01:08:30.906653182 +0100
1161-+++ nautilus/src/nautilus-application.c 2013-03-13 01:27:30.152464886 +0100
1162-@@ -524,7 +524,7 @@
1163- g_return_val_if_fail (NAUTILUS_IS_APPLICATION (application), NULL);
1164- nautilus_profile_start (NULL);
1165-
1166-- window = nautilus_window_new (GTK_APPLICATION (application), screen);
1167-+ window = nautilus_window_new (screen);
1168-
1169- maximized = g_settings_get_boolean
1170- (nautilus_window_state, NAUTILUS_WINDOW_STATE_MAXIMIZED);
1171-@@ -1579,6 +1579,98 @@
1172- }
1173-
1174- static void
1175-+update_dbus_opened_locations (NautilusApplication *app)
1176-+{
1177-+ gint i;
1178-+ GList *l, *sl;
1179-+ GList *locations = NULL;
1180-+ gsize locations_size = 0;
1181-+ gchar **locations_array;
1182-+
1183-+ g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
1184-+
1185-+ for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = l->next) {
1186-+ NautilusWindow *win = NAUTILUS_WINDOW (l->data);
1187-+
1188-+ if (NAUTILUS_IS_DESKTOP_WINDOW (win)) {
1189-+ continue;
1190-+ }
1191-+
1192-+ for (sl = nautilus_window_get_slots (win); sl; sl = sl->next) {
1193-+ NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (sl->data);
1194-+ gchar *uri = nautilus_window_slot_get_location_uri (slot);
1195-+
1196-+ if (uri) {
1197-+ GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
1198-+
1199-+ if (!found) {
1200-+ locations = g_list_prepend (locations, uri);
1201-+ ++locations_size;
1202-+ } else {
1203-+ g_free (uri);
1204-+ }
1205-+ }
1206-+ }
1207-+ }
1208-+
1209-+ locations_array = g_new (gchar*, locations_size + 1);
1210-+
1211-+ for (i = 0, l = locations; l; l = l->next, ++i) {
1212-+ /* We reuse the locations string locations saved on list */
1213-+ locations_array[i] = l->data;
1214-+ }
1215-+
1216-+ locations_array[locations_size] = NULL;
1217-+
1218-+ nautilus_freedesktop_dbus_set_open_locations ((const gchar**) locations_array);
1219-+
1220-+ g_free (locations_array);
1221-+ g_list_free_full (locations, g_free);
1222-+}
1223-+
1224-+static void
1225-+on_slot_location_changed (NautilusWindowSlot *slot,
1226-+ const char *from,
1227-+ const char *to,
1228-+ NautilusApplication *application)
1229-+{
1230-+ update_dbus_opened_locations (application);
1231-+}
1232-+
1233-+static void
1234-+on_slot_added (NautilusWindow *window,
1235-+ NautilusWindowSlot *slot,
1236-+ NautilusApplication *application)
1237-+{
1238-+ if (nautilus_window_slot_get_location (slot)) {
1239-+ update_dbus_opened_locations (application);
1240-+ }
1241-+
1242-+ g_signal_connect (slot, "location-changed", G_CALLBACK (on_slot_location_changed), application);
1243-+}
1244-+
1245-+static void
1246-+on_slot_removed (NautilusWindow *window,
1247-+ NautilusWindowSlot *slot,
1248-+ NautilusApplication *application)
1249-+{
1250-+ update_dbus_opened_locations (application);
1251-+
1252-+ g_signal_handlers_disconnect_by_func (slot, on_slot_location_changed, application);
1253-+}
1254-+
1255-+static void
1256-+nautilus_application_window_added (GtkApplication *app,
1257-+ GtkWindow *window)
1258-+{
1259-+ /* chain to parent */
1260-+ GTK_APPLICATION_CLASS (nautilus_application_parent_class)->window_added (app, window);
1261-+
1262-+ g_signal_connect (window, "slot-added", G_CALLBACK (on_slot_added), app);
1263-+ g_signal_connect (window, "slot-removed", G_CALLBACK (on_slot_removed), app);
1264-+}
1265-+
1266-+static void
1267- nautilus_application_window_removed (GtkApplication *app,
1268- GtkWindow *window)
1269- {
1270-@@ -1592,6 +1684,9 @@
1271- previewer = nautilus_previewer_get_singleton ();
1272- nautilus_previewer_call_close (previewer);
1273- }
1274-+
1275-+ g_signal_handlers_disconnect_by_func (window, on_slot_added, app);
1276-+ g_signal_handlers_disconnect_by_func (window, on_slot_removed, app);
1277- }
1278-
1279- static void
1280-@@ -1611,6 +1706,7 @@
1281- application_class->local_command_line = nautilus_application_local_command_line;
1282-
1283- gtkapp_class = GTK_APPLICATION_CLASS (class);
1284-+ gtkapp_class->window_added = nautilus_application_window_added;
1285- gtkapp_class->window_removed = nautilus_application_window_removed;
1286-
1287- g_type_class_add_private (class, sizeof (NautilusApplicationPriv));
1288-Index: nautilus/src/nautilus-window.c
1289-===================================================================
1290---- nautilus.orig/src/nautilus-window.c 2013-03-13 01:08:43.558919000 +0100
1291-+++ nautilus/src/nautilus-window.c 2013-03-13 01:29:17.256160975 +0100
1292-@@ -1119,6 +1119,7 @@
1293- static void
1294- nautilus_window_constructed (GObject *self)
1295- {
1296-+ NautilusApplication *application;
1297- NautilusWindow *window;
1298- GtkWidget *grid;
1299- NautilusWindowSlot *slot;
1300-@@ -1129,6 +1130,9 @@
1301-
1302- G_OBJECT_CLASS (nautilus_window_parent_class)->constructed (self);
1303-
1304-+ application = NAUTILUS_APPLICATION (g_application_get_default ());
1305-+ gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application));
1306-+
1307- /* disable automatic menubar handling, since we show our regular
1308- * menubar together with the app menu.
1309- */
1310-@@ -2028,11 +2032,9 @@
1311- }
1312-
1313- NautilusWindow *
1314--nautilus_window_new (GtkApplication *application,
1315-- GdkScreen *screen)
1316-+nautilus_window_new (GdkScreen *screen)
1317- {
1318- return g_object_new (NAUTILUS_TYPE_WINDOW,
1319-- "application", application,
1320- "screen", screen,
1321- NULL);
1322- }
1323-Index: nautilus/data/freedesktop-dbus-interfaces.xml
1324-===================================================================
1325---- nautilus.orig/data/freedesktop-dbus-interfaces.xml 2013-03-12 13:22:34.506542000 +0100
1326-+++ nautilus/data/freedesktop-dbus-interfaces.xml 2013-03-13 01:14:24.283872283 +0100
1327-@@ -32,5 +32,6 @@
1328- <arg type='as' name='URIs' direction='in'/>
1329- <arg type='s' name='StartupId' direction='in'/>
1330- </method>
1331-+ <property name="OpenLocations" type="as" access="read"/>
1332- </interface>
1333- </node>
1334-Index: nautilus/src/nautilus-freedesktop-dbus.c
1335-===================================================================
1336---- nautilus.orig/src/nautilus-freedesktop-dbus.c 2013-03-12 13:22:34.506542000 +0100
1337-+++ nautilus/src/nautilus-freedesktop-dbus.c 2013-03-13 01:27:53.096401970 +0100
1338-@@ -295,6 +295,14 @@
1339- /* nothing */
1340- }
1341-
1342-+void
1343-+nautilus_freedesktop_dbus_set_open_locations (const gchar **locations)
1344-+{
1345-+ g_return_if_fail (singleton);
1346-+
1347-+ nautilus_freedesktop_file_manager1_set_open_locations (singleton->skeleton, locations);
1348-+}
1349-+
1350- /* Tries to own the org.freedesktop.FileManager1 service name */
1351- void
1352- nautilus_freedesktop_dbus_start (NautilusApplication *app)
1353-Index: nautilus/src/nautilus-freedesktop-dbus.h
1354-===================================================================
1355---- nautilus.orig/src/nautilus-freedesktop-dbus.h 2013-03-12 13:22:34.506542000 +0100
1356-+++ nautilus/src/nautilus-freedesktop-dbus.h 2013-03-13 01:17:19.716808253 +0100
1357-@@ -27,5 +27,6 @@
1358-
1359- void nautilus_freedesktop_dbus_start (NautilusApplication *app);
1360- void nautilus_freedesktop_dbus_stop (void);
1361-+void nautilus_freedesktop_dbus_set_open_locations (const gchar **locations);
1362-
1363- #endif /* __NAUTILUS_FREEDESKTOP_DBUS_H__ */
1364-Index: nautilus/src/nautilus-window-manage-views.c
1365-===================================================================
1366---- nautilus.orig/src/nautilus-window-manage-views.c 2013-03-12 19:34:31.062512185 +0100
1367-+++ nautilus/src/nautilus-window-manage-views.c 2013-03-13 01:24:32.876892020 +0100
1368-@@ -1405,6 +1405,7 @@
1369- update_for_new_location (NautilusWindowSlot *slot)
1370- {
1371- NautilusWindow *window;
1372-+ GFile *old_location;
1373- GFile *new_location;
1374- NautilusFile *file;
1375- NautilusDirectory *directory;
1376-@@ -1424,11 +1425,11 @@
1377- slot->location == NULL ||
1378- !g_file_equal (slot->location, new_location);
1379-
1380-- nautilus_window_slot_emit_location_change (slot, slot->location, new_location);
1381--
1382- /* Set the new location. */
1383-- g_clear_object (&slot->location);
1384-+ old_location = slot->location;
1385- slot->location = new_location;
1386-+ nautilus_window_slot_emit_location_change (slot, old_location, new_location);
1387-+ g_clear_object (&old_location);
1388-
1389- /* Create a NautilusFile for this location, so we can catch it
1390- * if it goes away.
1391-Index: nautilus/src/nautilus-window.h
1392-===================================================================
1393---- nautilus.orig/src/nautilus-window.h 2013-03-13 01:08:30.934652783 +0100
1394-+++ nautilus/src/nautilus-window.h 2013-03-13 01:08:55.798311025 +0100
1395-@@ -93,8 +93,7 @@
1396- };
1397-
1398- GType nautilus_window_get_type (void);
1399--NautilusWindow * nautilus_window_new (GtkApplication *application,
1400-- GdkScreen *screen);
1401-+NautilusWindow * nautilus_window_new (GdkScreen *screen);
1402- void nautilus_window_close (NautilusWindow *window);
1403-
1404- void nautilus_window_connect_content_view (NautilusWindow *window,
1405
1406=== removed file 'debian/patches/git_fix_touch_double_click.patch'
1407--- debian/patches/git_fix_touch_double_click.patch 2013-03-06 17:49:53 +0000
1408+++ debian/patches/git_fix_touch_double_click.patch 1970-01-01 00:00:00 +0000
1409@@ -1,29 +0,0 @@
1410-Subject: [PATCH] eel-canvas: fix double tap with touchscreen devices
1411-
1412-Code here is not doing what the comment (and the symmetric part in
1413-the RELEASE case) says.
1414-
1415-https://bugzilla.gnome.org/show_bug.cgi?id=688281
1416----
1417- eel/eel-canvas.c | 4 +++-
1418- 1 file changed, 3 insertions(+), 1 deletion(-)
1419-
1420-diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
1421-index 4fdef13..7ebd6cc 100644
1422---- a/eel/eel-canvas.c
1423-+++ b/eel/eel-canvas.c
1424-@@ -2668,9 +2668,11 @@ eel_canvas_button (GtkWidget *widget, GdkEventButton *event)
1425- /* Pick the current item as if the button were not pressed, and
1426- * then process the event.
1427- */
1428-+ event->state ^= mask;
1429- canvas->state = event->state;
1430- pick_current_item (canvas, (GdkEvent *) event);
1431-- canvas->state ^= mask;
1432-+ event->state ^= mask;
1433-+ canvas->state = event->state;
1434- retval = emit_event (canvas, (GdkEvent *) event);
1435- break;
1436-
1437---
1438-1.8.1.2
1439
1440=== removed file 'debian/patches/git_launcher_no_frame.patch'
1441--- debian/patches/git_launcher_no_frame.patch 2012-12-03 14:38:18 +0000
1442+++ debian/patches/git_launcher_no_frame.patch 1970-01-01 00:00:00 +0000
1443@@ -1,103 +0,0 @@
1444-From 6cde4c5a6d639c85df09b8992a307f91d6b056a6 Mon Sep 17 00:00:00 2001
1445-From: Cosimo Cecchi <cosimoc@gnome.org>
1446-Date: Tue, 13 Nov 2012 13:16:17 +0000
1447-Subject: file: don't add a thumbnail border around desktop file launchers
1448-
1449-https://bugzilla.gnome.org/show_bug.cgi?id=688237
1450----
1451-diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
1452-index e9b7715..d554376 100644
1453---- a/libnautilus-private/nautilus-file.c
1454-+++ b/libnautilus-private/nautilus-file.c
1455-@@ -3953,6 +3953,18 @@ get_custom_icon_metadata_name (NautilusFile *file)
1456- }
1457-
1458- static GIcon *
1459-+get_link_icon (NautilusFile *file)
1460-+{
1461-+ GIcon *icon = NULL;
1462-+
1463-+ if (file->details->got_link_info && file->details->custom_icon != NULL) {
1464-+ icon = g_object_ref (file->details->custom_icon);
1465-+ }
1466-+
1467-+ return icon;
1468-+}
1469-+
1470-+static GIcon *
1471- get_custom_icon (NautilusFile *file)
1472- {
1473- char *custom_icon_uri, *custom_icon_name;
1474-@@ -3985,11 +3997,7 @@ get_custom_icon (NautilusFile *file)
1475- g_free (custom_icon_name);
1476- }
1477- }
1478--
1479-- if (icon == NULL && file->details->got_link_info && file->details->custom_icon != NULL) {
1480-- icon = g_object_ref (file->details->custom_icon);
1481-- }
1482--
1483-+
1484- return icon;
1485- }
1486-
1487-@@ -4086,6 +4094,12 @@ nautilus_file_get_gicon (NautilusFile *file,
1488- return icon;
1489- }
1490-
1491-+ icon = get_link_icon (file);
1492-+
1493-+ if (icon != NULL) {
1494-+ return icon;
1495-+ }
1496-+
1497- if (file->details->icon) {
1498- icon = NULL;
1499-
1500-@@ -4218,27 +4232,36 @@ nautilus_file_get_icon (NautilusFile *file,
1501- {
1502- NautilusIconInfo *icon;
1503- GIcon *gicon;
1504-+ gboolean custom_icon;
1505- GdkPixbuf *raw_pixbuf, *scaled_pixbuf;
1506- int modified_size;
1507-
1508- if (file == NULL) {
1509- return NULL;
1510- }
1511--
1512-+
1513-+ custom_icon = FALSE;
1514- gicon = get_custom_icon (file);
1515-+
1516- if (gicon) {
1517-- GdkPixbuf *pixbuf;
1518-+ custom_icon = TRUE;
1519-+ } else {
1520-+ gicon = get_link_icon (file);
1521-+ }
1522-
1523-+ if (gicon) {
1524- icon = nautilus_icon_info_lookup (gicon, size);
1525- g_object_unref (gicon);
1526-
1527-- pixbuf = nautilus_icon_info_get_pixbuf (icon);
1528-- if (pixbuf != NULL) {
1529-- nautilus_ui_frame_image (&pixbuf);
1530-- g_object_unref (icon);
1531-+ if (custom_icon) {
1532-+ raw_pixbuf = nautilus_icon_info_get_pixbuf (icon);
1533-+ if (raw_pixbuf != NULL) {
1534-+ nautilus_ui_frame_image (&raw_pixbuf);
1535-+ g_object_unref (icon);
1536-
1537-- icon = nautilus_icon_info_new_for_pixbuf (pixbuf);
1538-- g_object_unref (pixbuf);
1539-+ icon = nautilus_icon_info_new_for_pixbuf (raw_pixbuf);
1540-+ g_object_unref (raw_pixbuf);
1541-+ }
1542- }
1543-
1544- return icon;
1545---
1546-cgit v0.9.0.2
1547
1548=== removed file 'debian/patches/git_margin_primary_workarea_revert.patch'
1549--- debian/patches/git_margin_primary_workarea_revert.patch 2013-03-20 17:59:04 +0000
1550+++ debian/patches/git_margin_primary_workarea_revert.patch 1970-01-01 00:00:00 +0000
1551@@ -1,60 +0,0 @@
1552-From 6f6fcf1b4e99c8a5186c78e911a159b1f06df7b0 Mon Sep 17 00:00:00 2001
1553-From: Cosimo Cecchi <cosimoc@gnome.org>
1554-Date: Tue, 19 Mar 2013 23:25:37 +0000
1555-Subject: Revert "desktop-canvas: set margins according to the primary workarea"
1556-
1557-This fix proved to be more problematic than the original bug, so we'll
1558-revert to the original behavior for now.
1559-
1560-This reverts commit 1292610b87be44fcd5a7d5a09738cd7f3287325f.
1561-
1562-https://bugzilla.gnome.org/show_bug.cgi?id=695336
1563----
1564-diff --git a/src/nautilus-desktop-canvas-view.c b/src/nautilus-desktop-canvas-view.c
1565-index fb75139..75287ec 100644
1566---- a/src/nautilus-desktop-canvas-view.c
1567-+++ b/src/nautilus-desktop-canvas-view.c
1568-@@ -99,27 +99,27 @@ canvas_container_set_workarea (NautilusCanvasContainer *canvas_container,
1569- int n_items)
1570- {
1571- int left, right, top, bottom;
1572-+ int screen_width, screen_height;
1573- int i;
1574-- GdkRectangle geometry;
1575-
1576- left = right = top = bottom = 0;
1577-- gdk_screen_get_monitor_geometry (screen, gdk_screen_get_primary_monitor (screen), &geometry);
1578-
1579-- for (i = 0; i < n_items; i += 4) {
1580-- GdkRectangle workarea;
1581-+ screen_width = gdk_screen_get_width (screen);
1582-+ screen_height = gdk_screen_get_height (screen);
1583-
1584-- workarea.x = workareas[i];
1585-- workarea.y = workareas[i + 1];
1586-- workarea.width = workareas[i + 2];
1587-- workarea.height = workareas[i + 3];
1588-+ for (i = 0; i < n_items; i += 4) {
1589-+ int x = workareas [i];
1590-+ int y = workareas [i + 1];
1591-+ int width = workareas [i + 2];
1592-+ int height = workareas [i + 3];
1593-
1594-- if (!gdk_rectangle_intersect (&geometry, &workarea, &workarea))
1595-+ if ((x + width) > screen_width || (y + height) > screen_height)
1596- continue;
1597-
1598-- left = MAX (left, workarea.x);
1599-- right = MAX (right, (geometry.x + geometry.width) - (workarea.x + workarea.width));
1600-- top = MAX (top, workarea.y);
1601-- bottom = MAX (bottom, (geometry.y + geometry.height) - (workarea.y + workarea.height));
1602-+ left = MAX (left, x);
1603-+ right = MAX (right, screen_width - width - x);
1604-+ top = MAX (top, y);
1605-+ bottom = MAX (bottom, screen_height - height - y);
1606- }
1607-
1608- nautilus_canvas_container_set_margins (canvas_container,
1609---
1610-cgit v0.9.1
1611-
1612
1613=== removed file 'debian/patches/git_rank_exact_matches_higher.patch'
1614--- debian/patches/git_rank_exact_matches_higher.patch 2013-04-16 10:17:12 +0000
1615+++ debian/patches/git_rank_exact_matches_higher.patch 1970-01-01 00:00:00 +0000
1616@@ -1,49 +0,0 @@
1617-From 8d0ae533c01fc785c097329f2e7f9a3faf686b6d Mon Sep 17 00:00:00 2001
1618-From: Cosimo Cecchi <cosimoc@gnome.org>
1619-Date: Thu, 04 Apr 2013 21:59:31 +0000
1620-Subject: query: rank prefix matches lower than exact matches
1621-
1622-Count how many letters are left after the string occurrence, and
1623-subtract that from the match score.
1624----
1625-diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c
1626-index 1393cd0..f282b0c 100644
1627---- a/libnautilus-private/nautilus-query.c
1628-+++ b/libnautilus-private/nautilus-query.c
1629-@@ -96,7 +96,7 @@ nautilus_query_matches_string (NautilusQuery *query,
1630- gchar *prepared_string, *ptr;
1631- gboolean found;
1632- gdouble retval;
1633-- gint idx;
1634-+ gint idx, nonexact_malus;
1635-
1636- if (!query->details->text) {
1637- return -1;
1638-@@ -111,12 +111,15 @@ nautilus_query_matches_string (NautilusQuery *query,
1639- prepared_string = prepare_string_for_compare (string);
1640- found = TRUE;
1641- ptr = NULL;
1642-+ nonexact_malus = 0;
1643-
1644- for (idx = 0; query->details->prepared_words[idx] != NULL; idx++) {
1645- if ((ptr = strstr (prepared_string, query->details->prepared_words[idx])) == NULL) {
1646- found = FALSE;
1647- break;
1648- }
1649-+
1650-+ nonexact_malus += strlen (ptr) - strlen (query->details->prepared_words[idx]);
1651- }
1652-
1653- if (!found) {
1654-@@ -124,7 +127,7 @@ nautilus_query_matches_string (NautilusQuery *query,
1655- return -1;
1656- }
1657-
1658-- retval = MAX (10.0, (50.0 / idx) - (gdouble) (ptr - prepared_string));
1659-+ retval = MAX (10.0, 50.0 - (gdouble) (ptr - prepared_string) - nonexact_malus);
1660- g_free (prepared_string);
1661-
1662- return retval;
1663---
1664-cgit v0.9.1
1665-
1666
1667=== removed file 'debian/patches/git_rank_reversed.patch'
1668--- debian/patches/git_rank_reversed.patch 2013-04-16 10:17:12 +0000
1669+++ debian/patches/git_rank_reversed.patch 1970-01-01 00:00:00 +0000
1670@@ -1,26 +0,0 @@
1671-From 771d497088bdc7c6c8be3c6a38f815c8ad531fca Mon Sep 17 00:00:00 2001
1672-From: Cosimo Cecchi <cosimoc@gnome.org>
1673-Date: Fri, 05 Apr 2013 00:01:35 +0000
1674-Subject: file: do not reverse collated order for files with same search rank
1675-
1676-When two search results rank equally, we fall back to the collated
1677-order.
1678-Since search is usually ranked reversed (highest at the top), we need to
1679-ensure we don't accidentally reverse the collated order as well.
1680-
1681-https://bugzilla.gnome.org/show_bug.cgi?id=688772
1682----
1683-diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
1684-index 60a1954..35235e1 100644
1685---- a/libnautilus-private/nautilus-file.c
1686-+++ b/libnautilus-private/nautilus-file.c
1687-@@ -3191,6 +3191,9 @@ nautilus_file_compare_for_sort (NautilusFile *file_1,
1688- result = compare_by_search_relevance (file_1, file_2);
1689- if (result == 0) {
1690- result = compare_by_full_path (file_1, file_2);
1691-+
1692-+ /* ensure alphabetical order for files of the same relevance */
1693-+ reversed = FALSE;
1694- }
1695- break;
1696- default:
1697
1698=== removed file 'debian/patches/git_reset_view_to_defaults.patch'
1699--- debian/patches/git_reset_view_to_defaults.patch 2013-04-16 10:17:12 +0000
1700+++ debian/patches/git_reset_view_to_defaults.patch 1970-01-01 00:00:00 +0000
1701@@ -1,18 +0,0 @@
1702-From 7ec5b026f5d1afe52e8c046b329ef30d7d3bc0a5 Mon Sep 17 00:00:00 2001
1703-From: Michael Wood <michael.g.wood@intel.com>
1704-Date: Wed, 10 Apr 2013 15:57:05 +0000
1705-Subject: view: Make sure we chain down to call reset_to_defaults on the view.
1706-
1707----
1708-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
1709-index 357da27..4441c40 100644
1710---- a/src/nautilus-view.c
1711-+++ b/src/nautilus-view.c
1712-@@ -474,6 +474,7 @@
1713- NAUTILUS_ACTION_SHOW_HIDDEN_FILES);
1714- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
1715- g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES));
1716-+ NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->reset_to_defaults (view);
1717- }
1718-
1719- static gboolean
1720
1721=== removed file 'debian/patches/git_restore_filename.patch'
1722--- debian/patches/git_restore_filename.patch 2012-12-03 14:37:29 +0000
1723+++ debian/patches/git_restore_filename.patch 1970-01-01 00:00:00 +0000
1724@@ -1,46 +0,0 @@
1725-From ecee8be850b8342c804de2ecc3e613b99a20a010 Mon Sep 17 00:00:00 2001
1726-From: Timothy Arceri <t_arceri@yahoo.com.au>
1727-Date: Thu, 29 Nov 2012 06:39:36 +0000
1728-Subject: Make sure to use correct filename when restoring from Trash
1729-
1730-https://bugzilla.gnome.org/show_bug.cgi?id=673598
1731----
1732-diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
1733-index b60b748..85d5a6f 100644
1734---- a/libnautilus-private/nautilus-file-operations.c
1735-+++ b/libnautilus-private/nautilus-file-operations.c
1736-@@ -3258,18 +3258,28 @@ get_target_file_with_custom_name (GFile *src,
1737-
1738- if (dest == NULL && !same_fs) {
1739- info = g_file_query_info (src,
1740-- G_FILE_ATTRIBUTE_STANDARD_COPY_NAME,
1741-+ G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
1742-+ G_FILE_ATTRIBUTE_TRASH_ORIG_PATH,
1743- 0, NULL, NULL);
1744-
1745- if (info) {
1746-- copyname = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME));
1747-+ copyname = NULL;
1748-+
1749-+ /* if file is being restored from trash make sure it uses its original name */
1750-+ if (g_file_has_uri_scheme (src, "trash")) {
1751-+ copyname = g_strdup (g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
1752-+ }
1753-+
1754-+ if (copyname == NULL) {
1755-+ copyname = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME));
1756-+ }
1757-
1758- if (copyname) {
1759- make_file_name_valid_for_dest_fs (copyname, dest_fs_type);
1760- dest = g_file_get_child_for_display_name (dest_dir, copyname, NULL);
1761- g_free (copyname);
1762- }
1763--
1764-+
1765- g_object_unref (info);
1766- }
1767- }
1768---
1769-cgit v0.9.0.2
1770-
1771
1772=== removed file 'debian/patches/git_restore_from_missing_directories.patch'
1773--- debian/patches/git_restore_from_missing_directories.patch 2013-04-04 23:48:07 +0000
1774+++ debian/patches/git_restore_from_missing_directories.patch 1970-01-01 00:00:00 +0000
1775@@ -1,142 +0,0 @@
1776-From f1cb32831df32009f7e8bd5fcc35c5ccdf64eee4 Mon Sep 17 00:00:00 2001
1777-From: Cosimo Cecchi <cosimoc@gnome.org>
1778-Date: Tue, 19 Mar 2013 09:30:45 +0000
1779-Subject: file-utils: ensure directories exist before restoring from trash
1780-
1781-Before restoring a file from trash, ensure its target directory exists on
1782-disk, otherwise the restore operation will fail trying to move a file to
1783-a nonexistent location.
1784-
1785-https://bugzilla.gnome.org/show_bug.cgi?id=695460
1786----
1787-diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
1788-index 2b779a1..a28f961 100644
1789---- a/libnautilus-private/nautilus-file-utilities.c
1790-+++ b/libnautilus-private/nautilus-file-utilities.c
1791-@@ -1160,15 +1160,92 @@ locations_from_file_list (GList *file_list)
1792- return g_list_reverse (ret);
1793- }
1794-
1795-+typedef struct {
1796-+ GHashTable *original_dirs_hash;
1797-+ GtkWindow *parent_window;
1798-+} RestoreFilesData;
1799-+
1800-+static void
1801-+ensure_dirs_task_ready_cb (GObject *_source,
1802-+ GAsyncResult *res,
1803-+ gpointer user_data)
1804-+{
1805-+ NautilusFile *original_dir;
1806-+ GFile *original_dir_location;
1807-+ GList *original_dirs, *files, *locations, *l;
1808-+ RestoreFilesData *data = user_data;
1809-+
1810-+ original_dirs = g_hash_table_get_keys (data->original_dirs_hash);
1811-+ for (l = original_dirs; l != NULL; l = l->next) {
1812-+ original_dir = NAUTILUS_FILE (l->data);
1813-+ original_dir_location = nautilus_file_get_location (original_dir);
1814-+
1815-+ files = g_hash_table_lookup (data->original_dirs_hash, original_dir);
1816-+ locations = locations_from_file_list (files);
1817-+
1818-+ nautilus_file_operations_move
1819-+ (locations, NULL,
1820-+ original_dir_location,
1821-+ data->parent_window,
1822-+ NULL, NULL);
1823-+
1824-+ g_list_free_full (locations, g_object_unref);
1825-+ g_object_unref (original_dir_location);
1826-+ }
1827-+
1828-+ g_list_free (original_dirs);
1829-+
1830-+ g_hash_table_unref (data->original_dirs_hash);
1831-+ g_slice_free (RestoreFilesData, data);
1832-+}
1833-+
1834-+static void
1835-+ensure_dirs_task_thread_func (GTask *task,
1836-+ gpointer source,
1837-+ gpointer task_data,
1838-+ GCancellable *cancellable)
1839-+{
1840-+ RestoreFilesData *data = task_data;
1841-+ NautilusFile *original_dir;
1842-+ GFile *original_dir_location;
1843-+ GList *original_dirs, *l;
1844-+
1845-+ original_dirs = g_hash_table_get_keys (data->original_dirs_hash);
1846-+ for (l = original_dirs; l != NULL; l = l->next) {
1847-+ original_dir = NAUTILUS_FILE (l->data);
1848-+ original_dir_location = nautilus_file_get_location (original_dir);
1849-+
1850-+ g_file_make_directory_with_parents (original_dir_location, cancellable, NULL);
1851-+ g_object_unref (original_dir_location);
1852-+ }
1853-+
1854-+ g_task_return_pointer (task, NULL, NULL);
1855-+}
1856-+
1857-+static void
1858-+restore_files_ensure_parent_directories (GHashTable *original_dirs_hash,
1859-+ GtkWindow *parent_window)
1860-+{
1861-+ RestoreFilesData *data;
1862-+ GTask *ensure_dirs_task;
1863-+
1864-+ data = g_slice_new0 (RestoreFilesData);
1865-+ data->parent_window = parent_window;
1866-+ data->original_dirs_hash = g_hash_table_ref (original_dirs_hash);
1867-+
1868-+ ensure_dirs_task = g_task_new (NULL, NULL, ensure_dirs_task_ready_cb, data);
1869-+ g_task_set_task_data (ensure_dirs_task, data, NULL);
1870-+ g_task_run_in_thread (ensure_dirs_task, ensure_dirs_task_thread_func);
1871-+ g_object_unref (ensure_dirs_task);
1872-+}
1873-+
1874- void
1875- nautilus_restore_files_from_trash (GList *files,
1876- GtkWindow *parent_window)
1877- {
1878-- NautilusFile *file, *original_dir;
1879-+ NautilusFile *file;
1880- GHashTable *original_dirs_hash;
1881-- GList *original_dirs, *unhandled_files;
1882-- GFile *original_dir_location;
1883-- GList *locations, *l;
1884-+ GList *unhandled_files, *l;
1885- char *message, *file_name;
1886-
1887- original_dirs_hash = nautilus_trashed_files_get_original_directories (files, &unhandled_files);
1888-@@ -1186,26 +1263,8 @@ nautilus_restore_files_from_trash (GList *files,
1889- }
1890-
1891- if (original_dirs_hash != NULL) {
1892-- original_dirs = g_hash_table_get_keys (original_dirs_hash);
1893-- for (l = original_dirs; l != NULL; l = l->next) {
1894-- original_dir = NAUTILUS_FILE (l->data);
1895-- original_dir_location = nautilus_file_get_location (original_dir);
1896--
1897-- files = g_hash_table_lookup (original_dirs_hash, original_dir);
1898-- locations = locations_from_file_list (files);
1899--
1900-- nautilus_file_operations_move
1901-- (locations, NULL,
1902-- original_dir_location,
1903-- parent_window,
1904-- NULL, NULL);
1905--
1906-- g_list_free_full (locations, g_object_unref);
1907-- g_object_unref (original_dir_location);
1908-- }
1909--
1910-- g_list_free (original_dirs);
1911-- g_hash_table_destroy (original_dirs_hash);
1912-+ restore_files_ensure_parent_directories (original_dirs_hash, parent_window);
1913-+ g_hash_table_unref (original_dirs_hash);
1914- }
1915-
1916- nautilus_file_list_unref (unhandled_files);
1917-
1918
1919=== removed file 'debian/patches/git_reuse_already_opened_views.patch'
1920--- debian/patches/git_reuse_already_opened_views.patch 2013-03-14 10:35:52 +0000
1921+++ debian/patches/git_reuse_already_opened_views.patch 1970-01-01 00:00:00 +0000
1922@@ -1,302 +0,0 @@
1923-Description: Focus already opened nautilus windows or tabs when an already
1924- opened location is requested. Add a --new-window command to force the opening
1925- of a new window.
1926-
1927-Origin: upstream, https://git.gnome.org/browse/nautilus/commit/?id=c8ee0c5
1928- https://git.gnome.org/browse/nautilus/commit/?id=d0b0b
1929- https://git.gnome.org/browse/nautilus/commit/?id=ce4255cf
1930-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694034
1931-Bug-Ubuntu: https://bugs.launchpad.net/nautilus/+bug/692444
1932-Forwarded: yes
1933-Applied-Upstream: 3.7.91
1934-Author: Marco Trevisan <marco@ubuntu.com>
1935-
1936-Index: nautilus/data/nautilus.desktop.in.in
1937-===================================================================
1938---- nautilus.orig/data/nautilus.desktop.in.in 2013-03-12 19:34:31.066512196 +0100
1939-+++ nautilus/data/nautilus.desktop.in.in 2013-03-12 19:34:41.726459664 +0100
1940-@@ -1,7 +1,7 @@
1941- [Desktop Entry]
1942- _Name=Files
1943- _Comment=Access and organize files
1944--Exec=nautilus %U
1945-+Exec=nautilus --new-window %U
1946- Icon=system-file-manager
1947- Terminal=false
1948- Type=Application
1949-Index: nautilus/libnautilus-private/nautilus-file-utilities.c
1950-===================================================================
1951---- nautilus.orig/libnautilus-private/nautilus-file-utilities.c 2013-03-12 19:34:31.066512196 +0100
1952-+++ nautilus/libnautilus-private/nautilus-file-utilities.c 2013-03-12 19:34:31.058512174 +0100
1953-@@ -1296,6 +1296,48 @@
1954- return NULL;
1955- }
1956-
1957-+gboolean
1958-+nautilus_file_selection_equal (GList *selection_a,
1959-+ GList *selection_b)
1960-+{
1961-+ GList *al, *bl;
1962-+ gboolean selection_matches;
1963-+
1964-+ if (selection_a == NULL || selection_b == NULL) {
1965-+ return (selection_a == selection_b);
1966-+ }
1967-+
1968-+ if (g_list_length (selection_a) != g_list_length (selection_b)) {
1969-+ return FALSE;
1970-+ }
1971-+
1972-+ selection_matches = TRUE;
1973-+
1974-+ for (al = selection_a; al; al = al->next) {
1975-+ GFile *a_location = nautilus_file_get_location (NAUTILUS_FILE (al->data));
1976-+ gboolean found = FALSE;
1977-+
1978-+ for (bl = selection_b; bl; bl = bl->next) {
1979-+ GFile *b_location = nautilus_file_get_location (NAUTILUS_FILE (bl->data));
1980-+ found = g_file_equal (b_location, a_location);
1981-+ g_object_unref (b_location);
1982-+
1983-+ if (found) {
1984-+ break;
1985-+ }
1986-+ }
1987-+
1988-+ selection_matches = found;
1989-+ g_object_unref (a_location);
1990-+
1991-+ if (!selection_matches) {
1992-+ break;
1993-+ }
1994-+ }
1995-+
1996-+ return selection_matches;
1997-+}
1998-+
1999- #if !defined (NAUTILUS_OMIT_SELF_CHECK)
2000-
2001- void
2002-Index: nautilus/libnautilus-private/nautilus-file-utilities.h
2003-===================================================================
2004---- nautilus.orig/libnautilus-private/nautilus-file-utilities.h 2013-03-12 19:34:31.066512196 +0100
2005-+++ nautilus/libnautilus-private/nautilus-file-utilities.h 2013-03-12 19:34:31.058512174 +0100
2006-@@ -95,4 +95,6 @@
2007- GCancellable *cancellable,
2008- gpointer user_data);
2009-
2010-+gboolean nautilus_file_selection_equal (GList *selection_a, GList *selection_b);
2011-+
2012- #endif /* NAUTILUS_FILE_UTILITIES_H */
2013-Index: nautilus/src/nautilus-application.c
2014-===================================================================
2015---- nautilus.orig/src/nautilus-application.c 2013-03-12 19:34:31.066512196 +0100
2016-+++ nautilus/src/nautilus-application.c 2013-03-12 19:34:31.058512174 +0100
2017-@@ -576,6 +576,47 @@
2018- }
2019- }
2020-
2021-+static NautilusWindowSlot *
2022-+get_window_slot_for_location (NautilusApplication *application, GFile *location)
2023-+{
2024-+ NautilusWindowSlot *slot;
2025-+ GList *l, *sl;
2026-+
2027-+ slot = NULL;
2028-+
2029-+ if (g_file_query_file_type (location, G_FILE_QUERY_INFO_NONE, NULL) != G_FILE_TYPE_DIRECTORY) {
2030-+ location = g_file_get_parent (location);
2031-+ } else {
2032-+ g_object_ref (location);
2033-+ }
2034-+
2035-+ for (l = gtk_application_get_windows (GTK_APPLICATION (application)); l; l = l->next) {
2036-+ NautilusWindow *win = NAUTILUS_WINDOW (l->data);
2037-+
2038-+ if (NAUTILUS_IS_DESKTOP_WINDOW (win))
2039-+ continue;
2040-+
2041-+ for (sl = nautilus_window_get_slots (win); sl; sl = sl->next) {
2042-+ NautilusWindowSlot *current = NAUTILUS_WINDOW_SLOT (sl->data);
2043-+ GFile *slot_location = nautilus_window_slot_get_location (current);
2044-+
2045-+ if (g_file_equal (slot_location, location)) {
2046-+ slot = current;
2047-+ break;
2048-+ }
2049-+ }
2050-+
2051-+ if (slot) {
2052-+ break;
2053-+ }
2054-+ }
2055-+
2056-+ g_object_unref (location);
2057-+
2058-+ return slot;
2059-+}
2060-+
2061-+
2062- static void
2063- open_window (NautilusApplication *application,
2064- GFile *location, GdkScreen *screen, const char *geometry)
2065-@@ -609,6 +650,7 @@
2066-
2067- static void
2068- open_windows (NautilusApplication *application,
2069-+ gboolean force_new,
2070- GFile **files,
2071- gint n_files,
2072- GdkScreen *screen,
2073-@@ -621,8 +663,22 @@
2074- open_window (application, NULL, screen, geometry);
2075- } else {
2076- /* Open windows at each requested location. */
2077-- for (i = 0; i < n_files; i++) {
2078-- open_window (application, files[i], screen, geometry);
2079-+ for (i = 0; i < n_files; ++i) {
2080-+ NautilusWindowSlot *slot = NULL;
2081-+
2082-+ if (!force_new)
2083-+ slot = get_window_slot_for_location (application, files[i]);
2084-+
2085-+ if (!slot) {
2086-+ open_window (application, files[i], screen, geometry);
2087-+ } else {
2088-+ /* We open the location again to update any possible selection */
2089-+ nautilus_window_slot_open_location (slot, files[i], 0);
2090-+
2091-+ NautilusWindow *window = nautilus_window_slot_get_window (slot);
2092-+ nautilus_window_set_active_slot (window, slot);
2093-+ gtk_window_present (GTK_WINDOW (window));
2094-+ }
2095- }
2096- }
2097- }
2098-@@ -634,19 +690,28 @@
2099- const char *startup_id)
2100- {
2101- NautilusWindow *window;
2102-+ NautilusWindowSlot *slot;
2103- GList *sel_list = NULL;
2104-
2105- nautilus_profile_start (NULL);
2106-
2107-- window = nautilus_application_create_window (application, gdk_screen_get_default ());
2108-- gtk_window_set_startup_id (GTK_WINDOW (window), startup_id);
2109-+ slot = get_window_slot_for_location (application, location);
2110-+
2111-+ if (!slot) {
2112-+ window = nautilus_application_create_window (application, gdk_screen_get_default ());
2113-+ slot = nautilus_window_get_active_slot (window);
2114-+ } else {
2115-+ window = nautilus_window_slot_get_window (slot);
2116-+ nautilus_window_set_active_slot (window, slot);
2117-+ gtk_window_present (GTK_WINDOW (window));
2118-+ }
2119-
2120- if (selection != NULL) {
2121- sel_list = g_list_prepend (sel_list, nautilus_file_get (selection));
2122- }
2123-
2124-- nautilus_window_slot_open_location_full (nautilus_window_get_active_slot (window), location,
2125-- 0, sel_list, NULL, NULL);
2126-+ gtk_window_set_startup_id (GTK_WINDOW (window), startup_id);
2127-+ nautilus_window_slot_open_location_full (slot, location, 0, sel_list, NULL, NULL);
2128-
2129- if (sel_list != NULL) {
2130- nautilus_file_list_free (sel_list);
2131-@@ -665,7 +730,9 @@
2132-
2133- DEBUG ("Open called on the GApplication instance; %d files", n_files);
2134-
2135-- open_windows (self, files, n_files,
2136-+ gboolean force_new = (g_strcmp0 (hint, "new-window") == 0);
2137-+
2138-+ open_windows (self, force_new, files, n_files,
2139- gdk_screen_get_default (),
2140- self->priv->geometry);
2141- }
2142-@@ -1059,6 +1126,7 @@
2143- gboolean version = FALSE;
2144- gboolean browser = FALSE;
2145- gboolean kill_shell = FALSE;
2146-+ gboolean open_new_window = FALSE;
2147- gboolean no_default_window = FALSE;
2148- gchar **remaining = NULL;
2149- NautilusApplication *self = NAUTILUS_APPLICATION (application);
2150-@@ -1075,6 +1143,8 @@
2151- N_("Show the version of the program."), NULL },
2152- { "geometry", 'g', 0, G_OPTION_ARG_STRING, &self->priv->geometry,
2153- N_("Create the initial window with the given geometry."), N_("GEOMETRY") },
2154-+ { "new-window", 'w', 0, G_OPTION_ARG_NONE, &open_new_window,
2155-+ N_("Always open a new window for browsing specified URIs"), NULL },
2156- { "no-default-window", 'n', 0, G_OPTION_ARG_NONE, &no_default_window,
2157- N_("Only create windows for explicitly specified URIs."), NULL },
2158- { "no-desktop", '\0', 0, G_OPTION_ARG_NONE, &self->priv->no_desktop,
2159-@@ -1089,7 +1159,6 @@
2160- GError *error = NULL;
2161- gint argc = 0;
2162- gchar **argv = NULL;
2163--
2164- *exit_status = EXIT_SUCCESS;
2165-
2166- nautilus_profile_start (NULL);
2167-@@ -1127,8 +1196,8 @@
2168- goto out;
2169- }
2170-
2171-- DEBUG ("Parsing local command line, no_default_window %d, quit %d, "
2172-- "self checks %d, no_desktop %d",
2173-+ DEBUG ("Parsing local command line, open_new_window %d, no_default_window %d, "
2174-+ "quit %d, self checks %d, no_desktop %d", open_new_window,
2175- no_default_window, kill_shell, perform_self_check, self->priv->no_desktop);
2176-
2177- g_application_register (application, NULL, &error);
2178-@@ -1185,7 +1254,7 @@
2179-
2180- /* Invoke "Open" to create new windows */
2181- if (len > 0) {
2182-- g_application_open (application, files, len, "");
2183-+ g_application_open (application, files, len, open_new_window ? "new-window" : "");
2184- }
2185-
2186- for (idx = 0; idx < len; idx++) {
2187-Index: nautilus/src/nautilus-window-manage-views.c
2188-===================================================================
2189---- nautilus.orig/src/nautilus-window-manage-views.c 2013-03-12 19:34:31.066512196 +0100
2190-+++ nautilus/src/nautilus-window-manage-views.c 2013-03-12 19:34:31.062512185 +0100
2191-@@ -427,6 +427,7 @@
2192- NautilusWindowSlot *target_slot;
2193- NautilusWindowOpenFlags slot_flags;
2194- GFile *old_location;
2195-+ GList *old_selection;
2196- char *old_uri, *new_uri;
2197- int new_slot_position;
2198- gboolean use_same;
2199-@@ -525,9 +526,14 @@
2200- }
2201- }
2202-
2203-- if (target_window == window && target_slot == slot &&
2204-+ old_selection = NULL;
2205-+ if (slot->content_view != NULL) {
2206-+ old_selection = nautilus_view_get_selection (slot->content_view);
2207-+ }
2208-+
2209-+ if (target_window == window && target_slot == slot && !is_desktop &&
2210- old_location && g_file_equal (old_location, location) &&
2211-- !is_desktop) {
2212-+ nautilus_file_selection_equal (old_selection, new_selection)) {
2213-
2214- if (callback != NULL) {
2215- callback (window, location, NULL, user_data);
2216-@@ -537,7 +543,7 @@
2217- }
2218-
2219- slot->pending_use_default_location = ((flags & NAUTILUS_WINDOW_OPEN_FLAG_USE_DEFAULT_LOCATION) != 0);
2220-- begin_location_change (target_slot, location, old_location, new_selection,
2221-+ begin_location_change (target_slot, location, old_location, new_selection,
2222- NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
2223-
2224- done:
2225
2226=== removed file 'debian/patches/git_search_dir_incremental_load.patch'
2227--- debian/patches/git_search_dir_incremental_load.patch 2013-03-22 17:44:56 +0000
2228+++ debian/patches/git_search_dir_incremental_load.patch 1970-01-01 00:00:00 +0000
2229@@ -1,148 +0,0 @@
2230-From e153ba8046f52680b98a5fc209c2b4161b193d2d Mon Sep 17 00:00:00 2001
2231-From: Cosimo Cecchi <cosimoc@gnome.org>
2232-Date: Fri, 12 Oct 2012 23:04:14 +0000
2233-Subject: search-directory: enable incremental directory load
2234-
2235-Instead of emitting nautilus_directory_done_loading() from the
2236-"finished" callback, do it as soon as we receive the first batch of
2237-hits. The rest of the results will be added to the directory in
2238-background.
2239-
2240-https://bugzilla.gnome.org/show_bug.cgi?id=663242
2241----
2242-diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
2243-index 5da6f7a..510d319 100644
2244---- a/libnautilus-private/nautilus-search-directory.c
2245-+++ b/libnautilus-private/nautilus-search-directory.c
2246-@@ -46,7 +46,7 @@ struct NautilusSearchDirectoryDetails {
2247- NautilusSearchEngine *engine;
2248-
2249- gboolean search_running;
2250-- gboolean search_finished;
2251-+ gboolean search_loaded;
2252-
2253- GList *files;
2254- GHashTable *files_hash;
2255-@@ -90,7 +90,6 @@ G_DEFINE_TYPE (NautilusSearchDirectory, nautilus_search_directory,
2256- static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
2257-
2258- static void search_engine_hits_added (NautilusSearchEngine *engine, GList *hits, NautilusSearchDirectory *search);
2259--static void search_engine_finished (NautilusSearchEngine *engine, NautilusSearchDirectory *search);
2260- static void search_engine_error (NautilusSearchEngine *engine, const char *error, NautilusSearchDirectory *search);
2261- static void search_callback_file_ready_callback (NautilusFile *file, gpointer data);
2262- static void file_changed (NautilusFile *file, NautilusSearchDirectory *search);
2263-@@ -161,7 +160,7 @@ start_search (NautilusSearchDirectory *search)
2264-
2265- /* We need to start the search engine */
2266- search->details->search_running = TRUE;
2267-- search->details->search_finished = FALSE;
2268-+ search->details->search_loaded = FALSE;
2269-
2270- set_hidden_files (search);
2271- nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (search->details->engine),
2272-@@ -436,7 +435,7 @@ search_call_when_ready (NautilusDirectory *directory,
2273- search_callback->wait_for_attributes = file_attributes;
2274- search_callback->wait_for_file_list = wait_for_file_list;
2275-
2276-- if (wait_for_file_list && !search->details->search_finished) {
2277-+ if (wait_for_file_list && !search->details->search_loaded) {
2278- /* Add it to the pending callback list, which will be
2279- * processed when the directory has finished loading
2280- */
2281-@@ -494,6 +493,14 @@ search_cancel_callback (NautilusDirectory *directory,
2282- }
2283- }
2284-
2285-+static void
2286-+search_callback_add_pending_file_callbacks (SearchCallback *callback)
2287-+{
2288-+ callback->file_list = nautilus_file_list_copy (callback->search_directory->details->files);
2289-+ callback->non_ready_hash = file_list_to_hash_table (callback->search_directory->details->files);
2290-+
2291-+ search_callback_add_file_callbacks (callback);
2292-+}
2293-
2294- static void
2295- search_engine_hits_added (NautilusSearchEngine *engine, GList *hits,
2296-@@ -542,15 +549,20 @@ search_engine_hits_added (NautilusSearchEngine *engine, GList *hits,
2297- file = nautilus_directory_get_corresponding_file (NAUTILUS_DIRECTORY (search));
2298- nautilus_file_emit_changed (file);
2299- nautilus_file_unref (file);
2300--}
2301-
2302--static void
2303--search_callback_add_pending_file_callbacks (SearchCallback *callback)
2304--{
2305-- callback->file_list = nautilus_file_list_copy (callback->search_directory->details->files);
2306-- callback->non_ready_hash = file_list_to_hash_table (callback->search_directory->details->files);
2307-+ if (!search->details->search_loaded) {
2308-+ search->details->search_loaded = TRUE;
2309-+ nautilus_directory_emit_done_loading (NAUTILUS_DIRECTORY (search));
2310-
2311-- search_callback_add_file_callbacks (callback);
2312-+ /* Add all file callbacks */
2313-+ g_list_foreach (search->details->pending_callback_list,
2314-+ (GFunc)search_callback_add_pending_file_callbacks, NULL);
2315-+ search->details->callback_list = g_list_concat (search->details->callback_list,
2316-+ search->details->pending_callback_list);
2317-+
2318-+ g_list_free (search->details->pending_callback_list);
2319-+ search->details->pending_callback_list = NULL;
2320-+ }
2321- }
2322-
2323- static void
2324-@@ -566,23 +578,6 @@ search_engine_error (NautilusSearchEngine *engine, const char *error_message, Na
2325- }
2326-
2327- static void
2328--search_engine_finished (NautilusSearchEngine *engine, NautilusSearchDirectory *search)
2329--{
2330-- search->details->search_finished = TRUE;
2331--
2332-- nautilus_directory_emit_done_loading (NAUTILUS_DIRECTORY (search));
2333--
2334-- /* Add all file callbacks */
2335-- g_list_foreach (search->details->pending_callback_list,
2336-- (GFunc)search_callback_add_pending_file_callbacks, NULL);
2337-- search->details->callback_list = g_list_concat (search->details->callback_list,
2338-- search->details->pending_callback_list);
2339--
2340-- g_list_free (search->details->pending_callback_list);
2341-- search->details->pending_callback_list = NULL;
2342--}
2343--
2344--static void
2345- search_force_reload (NautilusDirectory *directory)
2346- {
2347- NautilusSearchDirectory *search;
2348-@@ -593,7 +588,7 @@ search_force_reload (NautilusDirectory *directory)
2349- return;
2350- }
2351-
2352-- search->details->search_finished = FALSE;
2353-+ search->details->search_loaded = FALSE;
2354-
2355- /* Remove file monitors */
2356- reset_file_list (search);
2357-@@ -608,7 +603,7 @@ search_are_all_files_seen (NautilusDirectory *directory)
2358- search = NAUTILUS_SEARCH_DIRECTORY (directory);
2359-
2360- return (!search->details->query ||
2361-- search->details->search_finished);
2362-+ search->details->search_loaded);
2363- }
2364-
2365- static gboolean
2366-@@ -760,9 +755,6 @@ nautilus_search_directory_init (NautilusSearchDirectory *search)
2367- g_signal_connect (search->details->engine, "hits-added",
2368- G_CALLBACK (search_engine_hits_added),
2369- search);
2370-- g_signal_connect (search->details->engine, "finished",
2371-- G_CALLBACK (search_engine_finished),
2372-- search);
2373- g_signal_connect (search->details->engine, "error",
2374- G_CALLBACK (search_engine_error),
2375- search);
2376---
2377-cgit v0.9.1
2378
2379=== removed file 'debian/patches/git_search_dont_follow_symlinks.patch'
2380--- debian/patches/git_search_dont_follow_symlinks.patch 2013-04-16 10:17:12 +0000
2381+++ debian/patches/git_search_dont_follow_symlinks.patch 1970-01-01 00:00:00 +0000
2382@@ -1,26 +0,0 @@
2383-From 60234999479df2b890f532472ef5c9d312cfe0c9 Mon Sep 17 00:00:00 2001
2384-From: Cosimo Cecchi <cosimoc@gnome.org>
2385-Date: Thu, 04 Apr 2013 20:30:49 +0000
2386-Subject: search-engine-simple: don't follow symlinks when descending
2387-
2388-It's inconsistent with "find" and it can yield to unexpectedly large
2389-result sets.
2390-Do not follow symlinks when recursing the search down the hierarchy.
2391-
2392-https://bugzilla.gnome.org/show_bug.cgi?id=697181
2393----
2394-diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
2395-index 87ff363..9c80d2e 100644
2396---- a/libnautilus-private/nautilus-search-engine-simple.c
2397-+++ b/libnautilus-private/nautilus-search-engine-simple.c
2398-@@ -217,7 +217,8 @@ visit_directory (GFile *dir, SearchThreadData *data)
2399- :
2400- STD_ATTRIBUTES
2401- ,
2402-- 0, data->cancellable, NULL);
2403-+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
2404-+ data->cancellable, NULL);
2405-
2406- if (enumerator == NULL) {
2407- return;
2408---
2409
2410=== removed file 'debian/patches/git_search_recursive_dir.patch'
2411--- debian/patches/git_search_recursive_dir.patch 2013-03-22 17:44:56 +0000
2412+++ debian/patches/git_search_recursive_dir.patch 1970-01-01 00:00:00 +0000
2413@@ -1,78 +0,0 @@
2414-From 6a1cdcf6a68ed4f63890bf3a3ac2a0cca121321e Mon Sep 17 00:00:00 2001
2415-From: Cosimo Cecchi <cosimoc@gnome.org>
2416-Date: Thu, 18 Oct 2012 21:16:41 +0000
2417-Subject: search-directory: make the simple engine recursive
2418-
2419-https://bugzilla.gnome.org/show_bug.cgi?id=325146
2420----
2421-diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
2422-index 510d319..06901b6 100644
2423---- a/libnautilus-private/nautilus-search-directory.c
2424-+++ b/libnautilus-private/nautilus-search-directory.c
2425-@@ -145,6 +145,7 @@ static void
2426- start_search (NautilusSearchDirectory *search)
2427- {
2428- NautilusSearchEngineModel *model_provider;
2429-+ NautilusSearchEngineSimple *simple_provider;
2430-
2431- if (!search->details->query) {
2432- return;
2433-@@ -169,6 +170,9 @@ start_search (NautilusSearchDirectory *search)
2434- model_provider = nautilus_search_engine_get_model_provider (search->details->engine);
2435- nautilus_search_engine_model_set_model (model_provider, search->details->base_model);
2436-
2437-+ simple_provider = nautilus_search_engine_get_simple_provider (search->details->engine);
2438-+ g_object_set (simple_provider, "recursive", TRUE, NULL);
2439-+
2440- reset_file_list (search);
2441-
2442- nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (search->details->engine));
2443-diff --git a/libnautilus-private/nautilus-search-engine-simple.h b/libnautilus-private/nautilus-search-engine-simple.h
2444-index bd11197..93f491e 100644
2445---- a/libnautilus-private/nautilus-search-engine-simple.h
2446-+++ b/libnautilus-private/nautilus-search-engine-simple.h
2447-@@ -24,8 +24,6 @@
2448- #ifndef NAUTILUS_SEARCH_ENGINE_SIMPLE_H
2449- #define NAUTILUS_SEARCH_ENGINE_SIMPLE_H
2450-
2451--#include <libnautilus-private/nautilus-search-engine.h>
2452--
2453- #define NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE (nautilus_search_engine_simple_get_type ())
2454- #define NAUTILUS_SEARCH_ENGINE_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE, NautilusSearchEngineSimple))
2455- #define NAUTILUS_SEARCH_ENGINE_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE, NautilusSearchEngineSimpleClass))
2456-diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
2457-index c92b745..31fa941 100644
2458---- a/libnautilus-private/nautilus-search-engine.c
2459-+++ b/libnautilus-private/nautilus-search-engine.c
2460-@@ -313,3 +313,9 @@ nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine)
2461- {
2462- return engine->details->model;
2463- }
2464-+
2465-+NautilusSearchEngineSimple *
2466-+nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine)
2467-+{
2468-+ return engine->details->simple;
2469-+}
2470-diff --git a/libnautilus-private/nautilus-search-engine.h b/libnautilus-private/nautilus-search-engine.h
2471-index b9cefad..916dbdd 100644
2472---- a/libnautilus-private/nautilus-search-engine.h
2473-+++ b/libnautilus-private/nautilus-search-engine.h
2474-@@ -28,6 +28,7 @@
2475-
2476- #include <libnautilus-private/nautilus-directory.h>
2477- #include <libnautilus-private/nautilus-search-engine-model.h>
2478-+#include <libnautilus-private/nautilus-search-engine-simple.h>
2479-
2480- #define NAUTILUS_TYPE_SEARCH_ENGINE (nautilus_search_engine_get_type ())
2481- #define NAUTILUS_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE, NautilusSearchEngine))
2482-@@ -52,5 +53,7 @@ GType nautilus_search_engine_get_type (void);
2483- NautilusSearchEngine *nautilus_search_engine_new (void);
2484- NautilusSearchEngineModel *
2485- nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine);
2486-+NautilusSearchEngineSimple *
2487-+ nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine);
2488-
2489- #endif /* NAUTILUS_SEARCH_ENGINE_H */
2490---
2491-cgit v0.9.1
2492
2493=== removed file 'debian/patches/git_show_accelerators.patch'
2494--- debian/patches/git_show_accelerators.patch 2013-03-07 00:19:06 +0000
2495+++ debian/patches/git_show_accelerators.patch 1970-01-01 00:00:00 +0000
2496@@ -1,76 +0,0 @@
2497-From 1c2b1e33346d2b06dedff3d81fc36e679e2d0761 Mon Sep 17 00:00:00 2001
2498-From: Cosimo Cecchi <cosimoc@gnome.org>
2499-Date: Thu, 14 Feb 2013 14:48:09 +0000
2500-Subject: ui: specify accelerators=true for our menu definitions
2501-
2502-This will make GtkMenuButton do the right thing and show accelerators in
2503-the popup.
2504-Thanks to Juanjo Marín for the fix.
2505-
2506-https://bugzilla.gnome.org/show_bug.cgi?id=680962
2507----
2508-diff --git a/src/nautilus-canvas-view-ui.xml b/src/nautilus-canvas-view-ui.xml
2509-index 5a3b313..1caffe1 100644
2510---- a/src/nautilus-canvas-view-ui.xml
2511-+++ b/src/nautilus-canvas-view-ui.xml
2512-@@ -1,5 +1,5 @@
2513- <ui>
2514-- <popup name="ViewMenu">
2515-+ <popup name="ViewMenu" accelerators="true">
2516- <placeholder name="Layout Options">
2517- <menuitem name="Manual Layout" action="Manual Layout"/>
2518- <placeholder name="Auto Layout">
2519-diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
2520-index efdb9d1..e164fec 100644
2521---- a/src/nautilus-directory-view-ui.xml
2522-+++ b/src/nautilus-directory-view-ui.xml
2523-@@ -4,13 +4,13 @@
2524- <accelerator action="OpenCloseParent"/>
2525- <accelerator action="PropertiesAccel"/>
2526- <accelerator action="RenameSelectAll"/>
2527--<popup name="ViewMenu">
2528-+<popup name="ViewMenu" accelerators="true">
2529- <placeholder name="View Details">
2530- <menuitem name="Reset to Defaults" action="Reset to Defaults"/>
2531- <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
2532- </placeholder>
2533- </popup>
2534--<popup name="ActionMenu">
2535-+<popup name="ActionMenu" accelerators="true">
2536- <placeholder name="New Items Placeholder">
2537- <menuitem name="New Folder" action="New Folder"/>
2538- <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
2539-diff --git a/src/nautilus-list-view-ui.xml b/src/nautilus-list-view-ui.xml
2540-index 22ca858..20f336d 100644
2541---- a/src/nautilus-list-view-ui.xml
2542-+++ b/src/nautilus-list-view-ui.xml
2543-@@ -1,5 +1,5 @@
2544- <ui>
2545-- <popup name="ViewMenu">
2546-+ <popup name="ViewMenu" accelerators="true">
2547- <placeholder name="View Details">
2548- <menuitem name="Visible Columns" action="Visible Columns"/>
2549- </placeholder>
2550-diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
2551-index 2fb2961..4cb7348 100644
2552---- a/src/nautilus-shell-ui.xml
2553-+++ b/src/nautilus-shell-ui.xml
2554-@@ -15,7 +15,7 @@
2555- <accelerator action="ZoomOutAccel"/>
2556- <accelerator action="PromptLocationAccel"/>
2557- <accelerator action="ReloadAccel"/>
2558--<popup name="ViewMenu">
2559-+<popup name="ViewMenu" accelerators="true">
2560- <placeholder name="Zoom Items Placeholder">
2561- <menuitem name="Zoom In" action="Zoom In"/>
2562- <menuitem name="Zoom Out" action="Zoom Out"/>
2563-@@ -33,7 +33,7 @@
2564- <separator/>
2565- <placeholder name="View Details"/>
2566- </popup>
2567--<popup name="ActionMenu">
2568-+<popup name="ActionMenu" accelerators="true">
2569- <placeholder name="New Items Placeholder">
2570- <menuitem name="New Tab" action="New Tab"/>
2571- <menuitem name="New Window" action="New Window"/>
2572-
2573
2574=== removed file 'debian/patches/git_single_filesystem_count.patch'
2575--- debian/patches/git_single_filesystem_count.patch 2013-01-15 03:21:01 +0000
2576+++ debian/patches/git_single_filesystem_count.patch 1970-01-01 00:00:00 +0000
2577@@ -1,115 +0,0 @@
2578-From a645da5f1043c59203fd194fe85b6976d75d2ece Mon Sep 17 00:00:00 2001
2579-From: Phillip Susi <psusi@ubuntu.com>
2580-Date: Mon, 17 Dec 2012 14:11:54 +0000
2581-Subject: directory: limit deep scount (folder contents and size) to one filesystem
2582-
2583-When getting the size of the root directory, nautilus was descending
2584-into other filesystems including /proc, causing it to report nonsensical
2585-sizes.
2586-Store the fsid of the starting directory, and do not recurse into
2587-other mount points.
2588-
2589-https://bugzilla.gnome.org/show_bug.cgi?id=629394
2590-https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/585472
2591----
2592-diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
2593-index f1d53f3..6961ae0 100644
2594---- a/libnautilus-private/nautilus-directory-async.c
2595-+++ b/libnautilus-private/nautilus-directory-async.c
2596-@@ -135,6 +135,7 @@ struct DeepCountState {
2597- GFile *deep_count_location;
2598- GList *deep_count_subdirectories;
2599- GArray *seen_deep_count_inodes;
2600-+ char *fs_id;
2601- };
2602-
2603-
2604-@@ -2579,6 +2580,7 @@ deep_count_one (DeepCountState *state,
2605- NautilusFile *file;
2606- GFile *subdir;
2607- gboolean is_seen_inode;
2608-+ const char *fs_id;
2609-
2610- if (should_skip_file (NULL, info)) {
2611- return;
2612-@@ -2596,10 +2598,13 @@ deep_count_one (DeepCountState *state,
2613- file->details->deep_directory_count += 1;
2614-
2615- /* Record the fact that we have to descend into this directory. */
2616--
2617-- subdir = g_file_get_child (state->deep_count_location, g_file_info_get_name (info));
2618-- state->deep_count_subdirectories = g_list_prepend
2619-- (state->deep_count_subdirectories, subdir);
2620-+ fs_id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
2621-+ if (g_strcmp0 (fs_id, state->fs_id) == 0) {
2622-+ /* only if it is on the same filesystem */
2623-+ subdir = g_file_get_child (state->deep_count_location, g_file_info_get_name (info));
2624-+ state->deep_count_subdirectories = g_list_prepend
2625-+ (state->deep_count_subdirectories, subdir);
2626-+ }
2627- } else {
2628- /* Even non-regular files count as files. */
2629- file->details->deep_file_count += 1;
2630-@@ -2627,6 +2632,7 @@ deep_count_state_free (DeepCountState *state)
2631- }
2632- g_list_free_full (state->deep_count_subdirectories, g_object_unref);
2633- g_array_free (state->seen_deep_count_inodes, TRUE);
2634-+ g_free (state->fs_id);
2635- g_free (state);
2636- }
2637-
2638-@@ -2773,6 +2779,7 @@ deep_count_load (DeepCountState *state, GFile *location)
2639- G_FILE_ATTRIBUTE_STANDARD_SIZE ","
2640- G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
2641- G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP ","
2642-+ G_FILE_ATTRIBUTE_ID_FILESYSTEM ","
2643- G_FILE_ATTRIBUTE_UNIX_INODE,
2644- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, /* flags */
2645- G_PRIORITY_LOW, /* prio */
2646-@@ -2804,6 +2811,25 @@ deep_count_stop (NautilusDirectory *directory)
2647- }
2648-
2649- static void
2650-+deep_count_got_info (GObject *source_object,
2651-+ GAsyncResult *res,
2652-+ gpointer user_data)
2653-+{
2654-+ GFileInfo *info;
2655-+ const char *id;
2656-+ GFile *file = (GFile *)source_object;
2657-+ DeepCountState *state = (DeepCountState *)user_data;
2658-+
2659-+ info = g_file_query_info_finish (file, res, NULL);
2660-+ if (info != NULL) {
2661-+ id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
2662-+ state->fs_id = g_strdup (id);
2663-+ g_object_unref (info);
2664-+ }
2665-+ deep_count_load (state, file);
2666-+}
2667-+
2668-+static void
2669- deep_count_start (NautilusDirectory *directory,
2670- NautilusFile *file,
2671- gboolean *doing_io)
2672-@@ -2846,11 +2872,18 @@ deep_count_start (NautilusDirectory *directory,
2673- state->directory = directory;
2674- state->cancellable = g_cancellable_new ();
2675- state->seen_deep_count_inodes = g_array_new (FALSE, TRUE, sizeof (guint64));
2676-+ state->fs_id = NULL;
2677-
2678- directory->details->deep_count_in_progress = state;
2679-
2680- location = nautilus_file_get_location (file);
2681-- deep_count_load (state, location);
2682-+ g_file_query_info_async (location,
2683-+ G_FILE_ATTRIBUTE_ID_FILESYSTEM,
2684-+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
2685-+ G_PRIORITY_DEFAULT,
2686-+ NULL,
2687-+ deep_count_got_info,
2688-+ state);
2689- g_object_unref (location);
2690- }
2691-
2692-
2693
2694=== modified file 'debian/patches/series'
2695--- debian/patches/series 2013-06-10 16:47:24 +0000
2696+++ debian/patches/series 2013-06-17 03:30:40 +0000
2697@@ -3,8 +3,6 @@
2698 #05_desktop_menu_export.patch
2699 06_never_exec_nonexec_launchers.patch
2700 08_clean_session_capplet.patch
2701-09_no-initial-fade.patch
2702-git_reuse_already_opened_views.patch
2703 11_copy_skipping_pager.patch
2704 12_unity_launcher_support.patch
2705 14_bring_del_instead_ctrl_del.patch
2706@@ -14,25 +12,4 @@
2707 18_unity_icon_color.patch
2708 zg_activity_logging.patch
2709 dont_wrap_labels_after_dots.patch
2710-git_add_missing_tooltips.patch
2711-git_launcher_no_frame.patch
2712-git_restore_filename.patch
2713-git_single_filesystem_count.patch
2714-git_fix_touch_double_click.patch
2715-git_show_accelerators.patch
2716-git_add_desktop_keywords.patch
2717-git_export_opened_locations_on_dbus.patch
2718-git_margin_primary_workarea_revert.patch
2719-10_sync_background_to_accountsservice.patch
2720-git_search_dir_incremental_load.patch
2721-git_enable_simple_search_engine.patch
2722-git_search_recursive_dir.patch
2723-git_enable_copy_from_recent.patch
2724-git_restore_from_missing_directories.patch
2725 19_unity_open_location_xid.patch
2726-git_reset_view_to_defaults.patch
2727-git_rank_exact_matches_higher.patch
2728-git_rank_reversed.patch
2729-git_search_dont_follow_symlinks.patch
2730-git_eel_needs_terminal.patch
2731-0001-trash-bar-fix-double-disconnect-handler.patch
2732
2733=== modified file 'debian/patches/zg_activity_logging.patch'
2734--- debian/patches/zg_activity_logging.patch 2012-10-29 00:09:57 +0000
2735+++ debian/patches/zg_activity_logging.patch 2013-06-17 03:30:40 +0000
2736@@ -1,17 +1,17 @@
2737 === modified file 'nautilus-3.3.91/libnautilus-private/Makefile.am'
2738-Index: nautilus-3.5.5/libnautilus-private/Makefile.am
2739+Index: nautilus-3.8.1/libnautilus-private/Makefile.am
2740 ===================================================================
2741---- nautilus-3.5.5.orig/libnautilus-private/Makefile.am 2012-08-07 17:53:26.000000000 +0200
2742-+++ nautilus-3.5.5/libnautilus-private/Makefile.am 2012-08-08 09:41:30.199206870 +0200
2743-@@ -12,6 +12,7 @@
2744+--- nautilus-3.8.1.orig/libnautilus-private/Makefile.am 2013-06-04 22:27:52.532397563 -0400
2745++++ nautilus-3.8.1/libnautilus-private/Makefile.am 2013-06-04 22:27:52.520397564 -0400
2746+@@ -11,6 +11,7 @@
2747 $(WARNING_CFLAGS) \
2748- $(DISABLE_DEPRECATED_CFLAGS) \
2749+ $(DISABLE_DEPRECATED) \
2750 $(TRACKER_CFLAGS) \
2751 + `pkg-config --cflags zeitgeist-1.0` \
2752 -DDATADIR=\""$(datadir)"\" \
2753 -DSYSCONFDIR=\""$(sysconfdir)"\" \
2754 -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
2755-@@ -44,6 +45,7 @@
2756+@@ -39,6 +40,7 @@
2757
2758 libnautilus_private_la_LDFLAGS = \
2759 -no-undefined \
2760@@ -19,10 +19,10 @@
2761 $(NULL)
2762
2763 libnautilus_private_la_LIBADD = \
2764-Index: nautilus-3.5.5/libnautilus-private/nautilus-file-operations.c
2765+Index: nautilus-3.8.1/libnautilus-private/nautilus-file-operations.c
2766 ===================================================================
2767---- nautilus-3.5.5.orig/libnautilus-private/nautilus-file-operations.c 2012-07-16 23:37:16.000000000 +0200
2768-+++ nautilus-3.5.5/libnautilus-private/nautilus-file-operations.c 2012-08-08 09:41:30.207206869 +0200
2769+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-file-operations.c 2013-06-04 22:27:52.532397563 -0400
2770++++ nautilus-3.8.1/libnautilus-private/nautilus-file-operations.c 2013-06-04 22:27:52.524397563 -0400
2771 @@ -66,6 +66,8 @@
2772 #include "nautilus-file-undo-operations.h"
2773 #include "nautilus-file-undo-manager.h"
2774@@ -137,7 +137,7 @@
2775 static void
2776 mark_desktop_file_trusted (CommonJob *common,
2777 GCancellable *cancellable,
2778-@@ -1864,6 +1964,35 @@
2779+@@ -1867,6 +1967,35 @@
2780
2781 job = user_data;
2782
2783@@ -173,7 +173,7 @@
2784 g_list_free_full (job->files, g_object_unref);
2785
2786 if (job->done_callback) {
2787-@@ -4504,6 +4633,23 @@
2788+@@ -4541,6 +4670,23 @@
2789 job->done_callback_data);
2790 }
2791
2792@@ -197,7 +197,7 @@
2793 g_list_free_full (job->files, g_object_unref);
2794 if (job->destination) {
2795 g_object_unref (job->destination);
2796-@@ -5067,6 +5213,19 @@
2797+@@ -5107,6 +5253,19 @@
2798 job->done_callback_data);
2799 }
2800
2801@@ -217,7 +217,7 @@
2802 g_list_free_full (job->files, g_object_unref);
2803 g_object_unref (job->destination);
2804 g_hash_table_unref (job->debuting_files);
2805-@@ -5410,6 +5569,23 @@
2806+@@ -5450,6 +5609,23 @@
2807 job->done_callback_data);
2808 }
2809
2810@@ -241,7 +241,7 @@
2811 g_list_free_full (job->files, g_object_unref);
2812 g_object_unref (job->destination);
2813 g_hash_table_unref (job->debuting_files);
2814-@@ -5882,6 +6058,14 @@
2815+@@ -5922,6 +6098,14 @@
2816 job->done_callback_data);
2817 }
2818
2819@@ -256,11 +256,11 @@
2820 g_object_unref (job->dest_dir);
2821 if (job->src) {
2822 g_object_unref (job->src);
2823-Index: nautilus-3.5.5/libnautilus-private/nautilus-file.c
2824+Index: nautilus-3.8.1/libnautilus-private/nautilus-file.c
2825 ===================================================================
2826---- nautilus-3.5.5.orig/libnautilus-private/nautilus-file.c 2012-08-08 09:41:29.955206857 +0200
2827-+++ nautilus-3.5.5/libnautilus-private/nautilus-file.c 2012-08-08 09:41:30.219206871 +0200
2828-@@ -90,6 +90,9 @@
2829+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-file.c 2013-06-04 22:27:52.532397563 -0400
2830++++ nautilus-3.8.1/libnautilus-private/nautilus-file.c 2013-06-04 22:27:52.524397563 -0400
2831+@@ -91,6 +91,9 @@
2832 #define DEBUG_REF_PRINTF printf
2833 #endif
2834
2835@@ -270,7 +270,7 @@
2836 /* Files that start with these characters sort after files that don't. */
2837 #define SORT_LAST_CHAR1 '.'
2838 #define SORT_LAST_CHAR2 '#'
2839-@@ -1728,10 +1731,34 @@
2840+@@ -1735,10 +1738,34 @@
2841 old_name = g_strdup (eel_ref_str_peek (op->file->details->name));
2842
2843 update_info_and_name (op->file, new_info);
2844@@ -306,10 +306,10 @@
2845 nautilus_directory_moved (old_uri, new_uri);
2846 g_free (new_uri);
2847 g_free (old_uri);
2848-Index: nautilus-3.5.5/test/Makefile.am
2849+Index: nautilus-3.8.1/test/Makefile.am
2850 ===================================================================
2851---- nautilus-3.5.5.orig/test/Makefile.am 2012-05-08 06:28:09.000000000 +0200
2852-+++ nautilus-3.5.5/test/Makefile.am 2012-08-08 09:41:30.219206871 +0200
2853+--- nautilus-3.8.1.orig/test/Makefile.am 2013-06-04 22:27:52.532397563 -0400
2854++++ nautilus-3.8.1/test/Makefile.am 2013-06-04 22:27:52.524397563 -0400
2855 @@ -6,6 +6,7 @@
2856 $(COMMON_CFLAGS) \
2857 $(NAUTILUS_CFLAGS) \
2858@@ -337,10 +337,10 @@
2859 EXTRA_DIST = \
2860 test.h \
2861 $(NULL)
2862-Index: nautilus-3.5.5/test/run-zeitgeist-test.sh
2863+Index: nautilus-3.8.1/test/run-zeitgeist-test.sh
2864 ===================================================================
2865 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
2866-+++ nautilus-3.5.5/test/run-zeitgeist-test.sh 2012-08-08 09:41:30.219206871 +0200
2867++++ nautilus-3.8.1/test/run-zeitgeist-test.sh 2013-06-04 22:27:52.524397563 -0400
2868 @@ -0,0 +1,50 @@
2869 +#! /bin/sh -e
2870 +
2871@@ -392,10 +392,10 @@
2872 +echo "Cleaning up..."
2873 +zeitgeist-daemon --quit
2874 +rm -r "${TMP_PATH}"
2875-Index: nautilus-3.5.5/test/test-nautilus-zeitgeist.c
2876+Index: nautilus-3.8.1/test/test-nautilus-zeitgeist.c
2877 ===================================================================
2878 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
2879-+++ nautilus-3.5.5/test/test-nautilus-zeitgeist.c 2012-08-08 09:41:30.219206871 +0200
2880++++ nautilus-3.8.1/test/test-nautilus-zeitgeist.c 2013-06-04 22:27:52.524397563 -0400
2881 @@ -0,0 +1,343 @@
2882 +/*
2883 + * Copyright © 2012 Canonical Ltd.

Subscribers

People subscribed via source and target branches

to all changes: