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

[Jeremy Bícha]

[Sebastien Bacher (seb128)]

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

[Jeremy Bícha (jbicha)]

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]

383. By Jeremy Bícha 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 Bícha on 2013-06-17

bump version to 3.8.2

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-10 17:06:35 +0000
+++ debian/changelog	2013-06-17 03:30:40 +0000
@@ -1,3 +1,43 @@
+nautilus (1:3.8.2-0ubuntu1) UNRELEASED; urgency=low
+
+  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
+
+  [ Jeremy Bicha ]
+  * 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
+  
+  [ Robert Ancell ]
+  * debian/control:
+    - Bump build-depends on libglib2.0-dev
+
+  [ Rico Tzschichholz ]
+  * 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
+
+  [ Tim Lunn ]
+  * Add build-dep on gsettings-desktop-schemas
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/patches:
+    - 19_unity_open_location_xid.patch: updated to apply properly
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 10 Jun 2013 16:28:56 -0400
+
 nautilus (1:3.6.3-0ubuntu18) saucy; urgency=low
 
   * debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch:
 
=== modified file 'debian/control'
--- debian/control	2013-05-28 10:48:02 +0000
+++ debian/control	2013-06-17 03:30:40 +0000
@@ -13,9 +13,9 @@
                dh-migrations,
                cdbs (>= 0.4.90),
                gnome-pkg-tools (>= 0.13),
-               libglib2.0-dev (>= 2.33.13),
+               libglib2.0-dev (>= 2.35.3),
                libatk1.0-dev (>= 1.32.0),
-               libgtk-3-dev (>= 3.5.12),
+               libgtk-3-dev (>= 3.7.7),
                libgail-3-dev,
                libgnome-desktop-3-dev (>= 3.0.0),
                libxml2-dev (>= 2.7.8),
@@ -31,6 +31,7 @@
                x11proto-core-dev,
                shared-mime-info (>= 0.50),
                gobject-introspection (>= 0.9.12-4~),
+               gsettings-desktop-schemas (>= 3.8.0),
                libgirepository1.0-dev (>= 0.9.12),
                libglib2.0-doc,
                libgtk-3-doc,
@@ -112,8 +113,8 @@
 Section: libdevel
 Depends: libnautilus-extension1a (= ${binary:Version}),
          gir1.2-nautilus-3.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.33.13),
-         libgtk-3-dev (>= 3.5.12),
+         libglib2.0-dev (>= 2.35.3),
+         libgtk-3-dev (>= 3.7.7),
          ${shlibs:Depends},
          ${misc:Depends}
 Description: libraries for nautilus components - development version
 
=== modified file 'debian/control.in'
--- debian/control.in	2013-03-08 15:55:47 +0000
+++ debian/control.in	2013-06-17 03:30:40 +0000
@@ -9,9 +9,9 @@
                dh-migrations,
                cdbs (>= 0.4.90),
                gnome-pkg-tools (>= 0.13),
-               libglib2.0-dev (>= 2.33.13),
+               libglib2.0-dev (>= 2.35.3),
                libatk1.0-dev (>= 1.32.0),
-               libgtk-3-dev (>= 3.5.12),
+               libgtk-3-dev (>= 3.7.7),
                libgail-3-dev,
                libgnome-desktop-3-dev (>= 3.0.0),
                libxml2-dev (>= 2.7.8),
@@ -27,6 +27,7 @@
                x11proto-core-dev,
                shared-mime-info (>= 0.50),
                gobject-introspection (>= 0.9.12-4~),
+               gsettings-desktop-schemas (>= 3.8.0),
                libgirepository1.0-dev (>= 0.9.12),
                libglib2.0-doc,
                libgtk-3-doc,
@@ -108,8 +109,8 @@
 Section: libdevel
 Depends: libnautilus-extension1a (= ${binary:Version}),
          gir1.2-nautilus-3.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.33.13),
-         libgtk-3-dev (>= 3.5.12),
+         libglib2.0-dev (>= 2.35.3),
+         libgtk-3-dev (>= 3.7.7),
          ${shlibs:Depends},
          ${misc:Depends}
 Description: libraries for nautilus components - development version
 
=== modified file 'debian/nautilus.install'
--- debian/nautilus.install	2012-10-29 00:09:57 +0000
+++ debian/nautilus.install	2013-06-17 03:30:40 +0000
@@ -3,7 +3,6 @@
 debian/nautilus-folder-handler.desktop usr/share/applications
 usr/bin
 usr/lib/nautilus/nautilus-convert-metadata
-usr/lib/nautilus/nautilus-shell-search-provider
 usr/lib/nautilus/extensions-3.0/*.so
 usr/share/applications
 usr/share/dbus-1
 
=== removed file 'debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch'
--- debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch	2013-06-10 16:47:24 +0000
+++ debian/patches/0001-trash-bar-fix-double-disconnect-handler.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-From 3d278607782dffa724d91680f4278273583e3962 Mon Sep 17 00:00:00 2001
-From: Pavel Vasin <[e-mail]>
-Date: Tue, 1 Jan 2013 15:53:26 +0400
-Subject: [PATCH] trash-bar: fix double disconnect handler
-
-https://bugzilla.gnome.org/show_bug.cgi?id=691004
----
- src/nautilus-trash-bar.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
-index 753de57..c41f48b 100644
---- a/src/nautilus-trash-bar.c
-+++ b/src/nautilus-trash-bar.c
-@@ -107,6 +107,7 @@ nautilus_trash_bar_dispose (GObject *obj)
- 
- 	if (bar->priv->selection_handler_id) {
- 		g_signal_handler_disconnect (bar->priv->view, bar->priv->selection_handler_id);
-+		bar->priv->selection_handler_id = 0;
- 	}
- 
- 	G_OBJECT_CLASS (nautilus_trash_bar_parent_class)->dispose (obj);
--- 
-1.8.3
-
 
=== modified file 'debian/patches/06_never_exec_nonexec_launchers.patch'
--- debian/patches/06_never_exec_nonexec_launchers.patch	2012-08-08 08:29:34 +0000
+++ debian/patches/06_never_exec_nonexec_launchers.patch	2013-06-17 03:30:40 +0000
@@ -3,11 +3,11 @@
  https://wiki.ubuntu.com/SecurityTeam/Policies#Execute-Permission%20Bit%20Required
 Author: Kees Cook <[e-mail]>
 
-Index: nautilus-3.5.5/src/nautilus-mime-actions.c
+Index: nautilus-3.7.2/src/nautilus-mime-actions.c
 ===================================================================
---- nautilus-3.5.5.orig/src/nautilus-mime-actions.c	2012-07-02 18:16:48.000000000 +0200
-+++ nautilus-3.5.5/src/nautilus-mime-actions.c	2012-08-08 09:41:29.943206858 +0200
-@@ -1553,12 +1553,14 @@
+--- nautilus-3.7.2.orig/src/nautilus-mime-actions.c	2012-11-16 03:54:24.000000000 +1300
++++ nautilus-3.7.2/src/nautilus-mime-actions.c	2012-11-27 12:40:56.976344888 +1300
+@@ -1562,12 +1562,14 @@
  			      "text", primary,
  			      "secondary-text", secondary,
  			      NULL);
@@ -22,4 +22,3 @@
  		gtk_dialog_add_button (GTK_DIALOG (dialog),
  				       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
  		gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
-
 
=== removed file 'debian/patches/09_no-initial-fade.patch'
--- debian/patches/09_no-initial-fade.patch	2012-10-29 00:09:57 +0000
+++ debian/patches/09_no-initial-fade.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=575964
-# Patch: http://bugzilla.gnome.org/attachment.cgi?id=130970&action=view
-# Description: remove initial background fade-in
-#
-#
-Index: nautilus-3.5.5/libnautilus-private/nautilus-desktop-background.c
-===================================================================
---- nautilus-3.5.5.orig/libnautilus-private/nautilus-desktop-background.c	2012-08-07 17:53:26.000000000 +0200
-+++ nautilus-3.5.5/libnautilus-private/nautilus-desktop-background.c	2012-08-08 09:41:30.007206861 +0200
-@@ -394,8 +394,6 @@
- 	self->details->screen_monitors_handler =
- 		g_signal_connect (screen, "monitors-changed",
- 				  G_CALLBACK (screen_size_changed), self);
--
--	init_fade (self);
- 	nautilus_desktop_background_set_up_widget (self);
- }
- 
 
=== modified file 'debian/patches/12_unity_launcher_support.patch'
--- debian/patches/12_unity_launcher_support.patch	2013-03-12 18:26:02 +0000
+++ debian/patches/12_unity_launcher_support.patch	2013-06-17 03:30:40 +0000
@@ -1,18 +1,18 @@
-=== modified file 'configure.in'
-Index: nautilus/configure.in
+=== modified file 'configure.ac'
+Index: nautilus-3.8.1/configure.ac
 ===================================================================
---- nautilus.orig/configure.in	2013-03-12 17:57:43.417743091 +0100
-+++ nautilus/configure.in	2013-03-12 17:57:43.413743092 +0100
-@@ -10,6 +10,8 @@
- m4_define(exif_minver,                 0.6.20)
+--- nautilus-3.8.1.orig/configure.ac	2013-06-04 22:54:22.616331061 -0400
++++ nautilus-3.8.1/configure.ac	2013-06-04 22:54:22.608331062 -0400
+@@ -11,6 +11,8 @@
  m4_define(exempi_minver,               2.1.0)
  m4_define(notify_minver,               0.7.0)
+ m4_define(schemas_minver,              3.8.0)
 +m4_define(unity_minver,                4.0.0)
 +m4_define(dbusmenu_minver,             0.4.90)
  
- 
  dnl 1. If the library code has changed at all since last release, then increment revision.
-@@ -191,6 +193,29 @@
+ dnl 2. If any interfaces have been added, then increment current and set revision to 0.
+@@ -193,6 +195,29 @@
  
  dnl ==========================================================================
  
@@ -42,7 +42,7 @@
  dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
  
  WARNING_CFLAGS=""
-@@ -345,6 +370,7 @@
+@@ -333,6 +358,7 @@
  	libexif support:	${enable_exif}
  	libexempi support:	${enable_xmp}
  	PackageKit support:     $msg_packagekit
@@ -50,10 +50,10 @@
  	nautilus-sendto ext:	$enable_nst_extension
  	Tracker support:	$enable_tracker
  
-Index: nautilus/libnautilus-private/nautilus-progress-info.c
+Index: nautilus-3.8.1/libnautilus-private/nautilus-progress-info.c
 ===================================================================
---- nautilus.orig/libnautilus-private/nautilus-progress-info.c	2013-03-12 17:57:43.417743091 +0100
-+++ nautilus/libnautilus-private/nautilus-progress-info.c	2013-03-12 17:57:43.413743092 +0100
+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-progress-info.c	2013-06-04 22:54:22.616331061 -0400
++++ nautilus-3.8.1/libnautilus-private/nautilus-progress-info.c	2013-06-04 22:54:22.608331062 -0400
 @@ -52,6 +52,8 @@
  	char *status;
  	char *details;
@@ -115,10 +115,10 @@
  		info->progress_at_idle = TRUE;
  		queue_idle (info, FALSE);
  	}
-Index: nautilus/libnautilus-private/nautilus-progress-info.h
+Index: nautilus-3.8.1/libnautilus-private/nautilus-progress-info.h
 ===================================================================
---- nautilus.orig/libnautilus-private/nautilus-progress-info.h	2013-03-12 17:57:43.417743091 +0100
-+++ nautilus/libnautilus-private/nautilus-progress-info.h	2013-03-12 17:57:43.413743092 +0100
+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-progress-info.h	2013-06-04 22:54:22.616331061 -0400
++++ nautilus-3.8.1/libnautilus-private/nautilus-progress-info.h	2013-06-04 22:54:22.608331062 -0400
 @@ -62,6 +62,8 @@
  gboolean      nautilus_progress_info_get_is_started  (NautilusProgressInfo *info);
  gboolean      nautilus_progress_info_get_is_finished (NautilusProgressInfo *info);
@@ -128,19 +128,19 @@
  
  void          nautilus_progress_info_start           (NautilusProgressInfo *info);
  void          nautilus_progress_info_finish          (NautilusProgressInfo *info);
-Index: nautilus/src/Makefile.am
+Index: nautilus-3.8.1/src/Makefile.am
 ===================================================================
---- nautilus.orig/src/Makefile.am	2013-03-12 17:57:43.417743091 +0100
-+++ nautilus/src/Makefile.am	2013-03-12 17:57:43.413743092 +0100
-@@ -31,6 +31,7 @@
+--- nautilus-3.8.1.orig/src/Makefile.am	2013-06-04 22:54:22.616331061 -0400
++++ nautilus-3.8.1/src/Makefile.am	2013-06-04 22:54:22.608331062 -0400
+@@ -29,6 +29,7 @@
  	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
  	-DVERSION="\"$(VERSION)\"" 				\
- 	$(DISABLE_DEPRECATED_CFLAGS)                            \
+ 	$(DISABLE_DEPRECATED) 		                        \
 +	$(UNITY_CFLAGS)                                         \
  	$(NULL)
  
  LDADD =\
-@@ -42,6 +43,7 @@
+@@ -40,6 +41,7 @@
  	$(EXIF_LIBS) \
  	$(EXEMPI_LIBS) \
  	$(POPT_LIBS) \
@@ -159,10 +159,10 @@
  	$(NULL)
  
  nodist_nautilus_SOURCES = \
-Index: nautilus/src/nautilus-progress-ui-handler.c
+Index: nautilus-3.8.1/src/nautilus-progress-ui-handler.c
 ===================================================================
---- nautilus.orig/src/nautilus-progress-ui-handler.c	2013-03-12 17:57:43.417743091 +0100
-+++ nautilus/src/nautilus-progress-ui-handler.c	2013-03-12 17:57:43.413743092 +0100
+--- nautilus-3.8.1.orig/src/nautilus-progress-ui-handler.c	2013-06-04 22:54:22.616331061 -0400
++++ nautilus-3.8.1/src/nautilus-progress-ui-handler.c	2013-06-04 22:54:22.608331062 -0400
 @@ -38,6 +38,11 @@
  
  #include <libnotify/notify.h>
@@ -185,7 +185,7 @@
  };
  
  G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);
-@@ -181,6 +189,221 @@
+@@ -183,6 +191,221 @@
  	gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
  }
  
@@ -407,7 +407,7 @@
  static gboolean
  progress_window_delete_event (GtkWidget *widget,
  			      GdkEvent *event,
-@@ -313,6 +536,10 @@
+@@ -317,6 +540,10 @@
  			progress_ui_handler_show_complete_notification (self);
  		}
  	}
@@ -418,7 +418,7 @@
  }
  
  static void
-@@ -335,6 +562,10 @@
+@@ -339,6 +566,10 @@
  			progress_ui_handler_update_notification_or_status (self);
  		}
  	}
@@ -429,10 +429,10 @@
  }
  
  typedef struct {
-Index: nautilus/src/unity-quicklist-handler.c
+Index: nautilus-3.8.1/src/unity-quicklist-handler.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus/src/unity-quicklist-handler.c	2013-03-12 17:57:43.413743092 +0100
++++ nautilus-3.8.1/src/unity-quicklist-handler.c	2013-06-04 22:54:22.608331062 -0400
 @@ -0,0 +1,153 @@
 +/*unity-quicklist-handler.c: handle Unity quicklists
 + *
@@ -587,10 +587,10 @@
 +	return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL);
 +}
 +
-Index: nautilus/src/unity-quicklist-handler.h
+Index: nautilus-3.8.1/src/unity-quicklist-handler.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus/src/unity-quicklist-handler.h	2013-03-12 17:57:43.413743092 +0100
++++ nautilus-3.8.1/src/unity-quicklist-handler.h	2013-06-04 22:54:22.612331061 -0400
 @@ -0,0 +1,75 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/*
@@ -667,10 +667,10 @@
 +#define UNITY_QUICKLIST_CANCEL_COPY _("Cancel All In-progress Actions")
 +
 +#endif /* __UNITY_QUICKLIST_HANDLER_H__ */
-Index: nautilus/src/nautilus-application.c
+Index: nautilus-3.8.1/src/nautilus-application.c
 ===================================================================
---- nautilus.orig/src/nautilus-application.c	2013-03-12 17:57:43.417743091 +0100
-+++ nautilus/src/nautilus-application.c	2013-03-12 17:57:43.417743091 +0100
+--- nautilus-3.8.1.orig/src/nautilus-application.c	2013-06-04 22:54:22.616331061 -0400
++++ nautilus-3.8.1/src/nautilus-application.c	2013-06-04 22:54:22.612331061 -0400
 @@ -79,6 +79,10 @@
  #include <gdk/gdkx.h>
  #include <gtk/gtk.h>
@@ -682,8 +682,8 @@
  /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
  #define APPLICATION_WINDOW_MIN_WIDTH	300
  #define APPLICATION_WINDOW_MIN_HEIGHT	100
-@@ -1548,6 +1552,10 @@
- 	nautilus_application_init_actions (self);
+@@ -1646,6 +1650,10 @@
+ 	init_desktop (self);
  
  	nautilus_profile_end (NULL);
 +
@@ -693,11 +693,11 @@
  }
  
  static void
-Index: nautilus/src/unity-bookmarks-handler.c
+Index: nautilus-3.8.1/src/unity-bookmarks-handler.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus/src/unity-bookmarks-handler.c	2013-03-12 18:57:09.410958729 +0100
-@@ -0,0 +1,144 @@
++++ nautilus-3.8.1/src/unity-bookmarks-handler.c	2013-06-04 22:54:36.572330478 -0400
+@@ -0,0 +1,140 @@
 +/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist
 + *
 + * Copyright (C) 2012 Canonical
@@ -802,10 +802,6 @@
 +
 +		bookmark = nautilus_bookmark_list_item_at (bookmarks, index);
 +
-+		if (nautilus_bookmark_uri_known_not_to_exist (bookmark)) {
-+			continue;
-+		}
-+
 +		for (l = unity_quicklist_get_launcher_entries (unity_quicklist_handler); l; l = l->next) {
 +			UnityLauncherEntry *entry = l->data;
 +
@@ -842,10 +838,10 @@
 +						G_CALLBACK (unity_bookmarks_handler_refresh_bookmarks), 0);
 +}
 +
-Index: nautilus/src/unity-bookmarks-handler.h
+Index: nautilus-3.8.1/src/unity-bookmarks-handler.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus/src/unity-bookmarks-handler.h	2013-03-12 17:57:43.417743091 +0100
++++ nautilus-3.8.1/src/unity-bookmarks-handler.h	2013-06-04 22:54:22.612331061 -0400
 @@ -0,0 +1,31 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/*
@@ -878,10 +874,10 @@
 +void unity_bookmarks_handler_initialize (void);
 +
 +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/
-Index: nautilus/po/POTFILES.in
+Index: nautilus-3.8.1/po/POTFILES.in
 ===================================================================
---- nautilus.orig/po/POTFILES.in	2013-03-12 17:57:43.417743091 +0100
-+++ nautilus/po/POTFILES.in	2013-03-12 17:57:43.417743091 +0100
+--- nautilus-3.8.1.orig/po/POTFILES.in	2013-06-04 22:54:22.616331061 -0400
++++ nautilus-3.8.1/po/POTFILES.in	2013-06-04 22:54:22.612331061 -0400
 @@ -90,3 +90,4 @@
  src/nautilus-window-private.h
  src/nautilus-window-slot.c
 
=== modified file 'debian/patches/15_use-ubuntu-help.patch'
--- debian/patches/15_use-ubuntu-help.patch	2012-11-03 15:59:48 +0000
+++ debian/patches/15_use-ubuntu-help.patch	2013-06-17 03:30:40 +0000
@@ -3,10 +3,10 @@
 Forwarded: Not needed
 Author: Jeremy Bicha <[e-mail]>
 
-Index: nautilus-3.6.2/src/nautilus-connect-server-dialog.c
+Index: nautilus-3.7.2/src/nautilus-connect-server-dialog.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-connect-server-dialog.c	2012-11-02 22:03:55.514929059 -0400
-+++ nautilus-3.6.2/src/nautilus-connect-server-dialog.c	2012-11-02 22:04:24.466927848 -0400
+--- nautilus-3.7.2.orig/src/nautilus-connect-server-dialog.c	2012-10-30 12:39:52.000000000 +1300
++++ nautilus-3.7.2/src/nautilus-connect-server-dialog.c	2012-11-27 12:42:46.844343840 +1300
 @@ -97,7 +97,12 @@
  		break;
  	case GTK_RESPONSE_HELP:
@@ -21,10 +21,10 @@
  			      "help:gnome-help/nautilus-connect",
  			      gtk_get_current_event_time (), &error);
  		if (error) {
-Index: nautilus-3.6.2/src/nautilus-file-management-properties.c
+Index: nautilus-3.7.2/src/nautilus-file-management-properties.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-file-management-properties.c	2012-11-02 22:03:55.514929059 -0400
-+++ nautilus-3.6.2/src/nautilus-file-management-properties.c	2012-11-02 22:04:24.466927848 -0400
+--- nautilus-3.7.2.orig/src/nautilus-file-management-properties.c	2012-10-30 12:39:52.000000000 +1300
++++ nautilus-3.7.2/src/nautilus-file-management-properties.c	2012-11-27 12:42:46.844343840 +1300
 @@ -232,7 +232,10 @@
  			section = "nautilus-preview";
  			break;
@@ -37,11 +37,11 @@
  	} else if (response_id == GTK_RESPONSE_CLOSE) {
  		gtk_widget_destroy (GTK_WIDGET (parent));
  	}
-Index: nautilus-3.6.2/src/nautilus-properties-window.c
+Index: nautilus-3.7.2/src/nautilus-properties-window.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-properties-window.c	2012-11-02 22:03:55.514929059 -0400
-+++ nautilus-3.6.2/src/nautilus-properties-window.c	2012-11-02 22:08:49.666916757 -0400
-@@ -3158,7 +3158,11 @@
+--- nautilus-3.7.2.orig/src/nautilus-properties-window.c	2012-11-14 02:19:44.000000000 +1300
++++ nautilus-3.7.2/src/nautilus-properties-window.c	2012-11-27 12:42:46.844343840 +1300
+@@ -3197,7 +3197,11 @@
  	GtkWidget *volume_usage;
  	GtkWidget *hbox, *vbox;
  
@@ -54,7 +54,7 @@
  				      "help:gnome-help/nautilus-file-properties-basic");
  	
  	/* Icon pixmap */
-@@ -4491,10 +4495,16 @@
+@@ -4532,10 +4536,16 @@
  	char *file_name, *prompt_text;
  	GList *file_list;
  
@@ -72,7 +72,7 @@
  	file_list = window->details->original_files;
  
  	window->details->initial_permissions = NULL;
-@@ -4791,7 +4801,11 @@
+@@ -4832,7 +4842,11 @@
  	g_free (mime_type);
  	g_list_free (files);
  
@@ -85,7 +85,7 @@
  	gtk_notebook_append_page (window->details->notebook, 
  				  vbox, gtk_label_new (_("Open With")));
  }
-@@ -5143,10 +5157,18 @@
+@@ -5184,10 +5198,18 @@
  		curpage = gtk_notebook_get_nth_page (window->details->notebook,
  						     gtk_notebook_get_current_page (window->details->notebook));
  		helpuri = g_object_get_data (G_OBJECT (curpage), "help-uri");
@@ -105,11 +105,11 @@
  		if (error != NULL) {
  			eel_show_error_dialog (_("There was an error displaying help."), error->message,
  					       GTK_WINDOW (dialog));
-Index: nautilus-3.6.2/src/nautilus-view.c
+Index: nautilus-3.7.2/src/nautilus-view.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-view.c	2012-11-02 22:03:55.514929059 -0400
-+++ nautilus-3.6.2/src/nautilus-view.c	2012-11-02 22:04:24.474927848 -0400
-@@ -1434,7 +1434,12 @@
+--- nautilus-3.7.2.orig/src/nautilus-view.c	2012-11-27 12:41:58.000000000 +1300
++++ nautilus-3.7.2/src/nautilus-view.c	2012-11-27 12:42:46.848343840 +1300
+@@ -1431,7 +1431,12 @@
  		break;
  	case GTK_RESPONSE_HELP :
  		error = NULL;
@@ -123,11 +123,11 @@
  			      "help:gnome-help/files-select",
  			      gtk_get_current_event_time (), &error);
  		if (error) {
-Index: nautilus-3.6.2/src/nautilus-window-menus.c
+Index: nautilus-3.7.2/src/nautilus-window-menus.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-window-menus.c	2012-11-02 22:03:55.514929059 -0400
-+++ nautilus-3.6.2/src/nautilus-window-menus.c	2012-11-02 22:04:24.474927848 -0400
-@@ -221,31 +221,39 @@
+--- nautilus-3.7.2.orig/src/nautilus-window-menus.c	2012-11-20 10:20:41.000000000 +1300
++++ nautilus-3.7.2/src/nautilus-window-menus.c	2012-11-27 12:42:46.848343840 +1300
+@@ -220,31 +220,39 @@
  	GError *error;
  	GtkWidget *dialog;
  	const char* helpuri;
@@ -173,17 +173,15 @@
  	if (error) {
  		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
  						 GTK_DIALOG_MODAL,
-Index: nautilus-3.6.2/src/nautilus-application.c
+Index: nautilus-3.7.2/src/nautilus-application.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-application.c	2012-11-02 22:03:55.514929059 -0400
-+++ nautilus-3.6.2/src/nautilus-application.c	2012-11-02 22:04:24.474927848 -0400
-@@ -874,8 +874,15 @@
- 	GtkApplication *application = user_data;
+--- nautilus-3.7.2.orig/src/nautilus-application.c	2012-11-27 12:42:33.680343967 +1300
++++ nautilus-3.7.2/src/nautilus-application.c	2012-11-27 12:42:46.848343840 +1300
+@@ -860,7 +860,14 @@
  	GError *error = NULL;
  
--	window = get_focus_window (application);	
+ 	window = gtk_application_get_active_window (application);
 -	gtk_show_uri (window ? 
-+	window = get_focus_window (application);
 +	if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
 +		gtk_show_uri (window ? 
 +		      gtk_window_get_screen (GTK_WINDOW (window)) :
 
=== modified file 'debian/patches/17_static_unity_quicklist.patch'
--- debian/patches/17_static_unity_quicklist.patch	2013-03-12 18:26:02 +0000
+++ debian/patches/17_static_unity_quicklist.patch	2013-06-17 03:30:40 +0000
@@ -1,11 +1,11 @@
-Index: nautilus/data/nautilus.desktop.in.in
+Index: nautilus-3.7.2/data/nautilus.desktop.in.in
 ===================================================================
---- nautilus.orig/data/nautilus.desktop.in.in	2013-03-12 17:08:37.121951465 +0100
-+++ nautilus/data/nautilus.desktop.in.in	2013-03-12 17:11:35.029894735 +0100
+--- nautilus-3.7.2.orig/data/nautilus.desktop.in.in	2012-11-14 02:19:44.000000000 +1300
++++ nautilus-3.7.2/data/nautilus.desktop.in.in	2012-11-27 12:42:49.748343814 +1300
 @@ -14,3 +14,9 @@
- X-GNOME-Bugzilla-Product=nautilus
  X-GNOME-Bugzilla-Component=general
  X-GNOME-Bugzilla-Version=@VERSION@
+ X-GNOME-UsesNotifications=true
 +Actions=Window;
 +
 +[Desktop Action Window]
 
=== modified file 'debian/patches/18_unity_icon_color.patch'
--- debian/patches/18_unity_icon_color.patch	2013-03-08 13:44:44 +0000
+++ debian/patches/18_unity_icon_color.patch	2013-06-17 03:30:40 +0000
@@ -1,10 +1,10 @@
-Index: nautilus-3.6.3/data/nautilus.desktop.in.in
+Index: nautilus-3.8.1/data/nautilus.desktop.in.in
 ===================================================================
---- nautilus-3.6.3.orig/data/nautilus.desktop.in.in	2013-03-08 11:22:36.712732149 +0100
-+++ nautilus-3.6.3/data/nautilus.desktop.in.in	2013-03-08 11:23:04.052733060 +0100
-@@ -14,6 +14,7 @@
- X-GNOME-Bugzilla-Component=general
+--- nautilus-3.8.1.orig/data/nautilus.desktop.in.in	2013-06-04 22:27:44.308397907 -0400
++++ nautilus-3.8.1/data/nautilus.desktop.in.in	2013-06-04 22:27:44.304397907 -0400
+@@ -16,6 +16,7 @@
  X-GNOME-Bugzilla-Version=@VERSION@
+ X-GNOME-UsesNotifications=true
  Actions=Window;
 +X-Unity-IconBackgroundColor=#af4853
  
 
=== modified file 'debian/patches/19_unity_open_location_xid.patch'
--- debian/patches/19_unity_open_location_xid.patch	2013-03-27 18:56:42 +0000
+++ debian/patches/19_unity_open_location_xid.patch	2013-06-17 03:30:40 +0000
@@ -1,7 +1,15 @@
+Description: Add a new dbus property to the nautilus'
+ "org.freedesktop.FileManager1" dbus interface where it stores the lists of
+ opened locations referenced by their parent nautilus window XID.
+
+Bug-Ubuntu: https://bugs.launchpad.net/unity/+bug/887449
+Forwarded: no
+Author: Marco Trevisan <[e-mail]>
+
 Index: nautilus/data/freedesktop-dbus-interfaces.xml
 ===================================================================
---- nautilus.orig/data/freedesktop-dbus-interfaces.xml	2013-03-27 15:18:14.620455679 +0100
-+++ nautilus/data/freedesktop-dbus-interfaces.xml	2013-03-27 15:18:36.812457731 +0100
+--- nautilus.orig/data/freedesktop-dbus-interfaces.xml	2013-06-10 21:00:24.913944953 +0200
++++ nautilus/data/freedesktop-dbus-interfaces.xml	2013-06-10 21:00:24.905944954 +0200
 @@ -33,5 +33,6 @@
        <arg type='s' name='StartupId' direction='in'/>
      </method>
@@ -11,9 +19,9 @@
  </node>
 Index: nautilus/src/nautilus-application.c
 ===================================================================
---- nautilus.orig/src/nautilus-application.c	2013-03-27 14:24:02.345633000 +0100
-+++ nautilus/src/nautilus-application.c	2013-03-27 17:22:49.598601760 +0100
-@@ -1589,6 +1589,11 @@
+--- nautilus.orig/src/nautilus-application.c	2013-06-10 21:00:24.913944953 +0200
++++ nautilus/src/nautilus-application.c	2013-06-10 21:00:24.905944954 +0200
+@@ -1672,6 +1672,11 @@
  
  	g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
  
@@ -25,7 +33,7 @@
  	for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = l->next) {
  		NautilusWindow *win = NAUTILUS_WINDOW (l->data);
  
-@@ -1596,11 +1601,15 @@
+@@ -1679,11 +1684,15 @@
  			continue;
  		}
  
@@ -41,7 +49,7 @@
  				GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
  
  				if (!found) {
-@@ -1611,6 +1620,17 @@
+@@ -1694,6 +1703,17 @@
  				}
  			}
  		}
@@ -59,15 +67,16 @@
  	}
  
  	locations_array = g_new (gchar*, locations_size + 1);
-@@ -1623,6 +1643,7 @@
- 	locations_array[locations_size] = NULL;
+@@ -1707,6 +1727,8 @@
  
- 	nautilus_freedesktop_dbus_set_open_locations ((const gchar**) locations_array);
-+	nautilus_freedesktop_dbus_set_open_locations_xids (g_variant_builder_end (&b));
+ 	nautilus_freedesktop_dbus_set_open_locations (app->priv->fdb_manager,
+ 		                                      (const gchar**) locations_array);
++	nautilus_freedesktop_dbus_set_open_locations_xids (app->priv->fdb_manager,
++							   g_variant_builder_end (&b));
  
  	g_free (locations_array);
  	g_list_free_full (locations, g_free);
-@@ -1660,14 +1681,24 @@
+@@ -1744,14 +1766,24 @@
  }
  
  static void
@@ -94,7 +103,7 @@
  }
  
  static void
-@@ -1685,8 +1716,11 @@
+@@ -1769,8 +1801,11 @@
  		nautilus_previewer_call_close (previewer);
  	}
  
@@ -110,31 +119,32 @@
  static void
 Index: nautilus/src/nautilus-freedesktop-dbus.c
 ===================================================================
---- nautilus.orig/src/nautilus-freedesktop-dbus.c	2013-03-27 14:24:02.345633000 +0100
-+++ nautilus/src/nautilus-freedesktop-dbus.c	2013-03-27 14:37:39.224743813 +0100
-@@ -303,6 +303,14 @@
- 	nautilus_freedesktop_file_manager1_set_open_locations (singleton->skeleton, locations);
+--- nautilus.orig/src/nautilus-freedesktop-dbus.c	2013-06-10 21:00:24.913944953 +0200
++++ nautilus/src/nautilus-freedesktop-dbus.c	2013-06-10 21:01:11.485942497 +0200
+@@ -229,6 +229,15 @@
+ 	nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations);
  }
  
 +void
-+nautilus_freedesktop_dbus_set_open_locations_xids (GVariant *locations)
++nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb,
++						   GVariant *locations)
 +{
-+	g_return_if_fail (singleton);
++	g_return_if_fail (NAUTILUS_IS_FREEDESKTOP_DBUS (fdb));
 +
-+	nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (singleton->skeleton, locations);
++	nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (fdb->skeleton, locations);
 +}
 +
  /* Tries to own the org.freedesktop.FileManager1 service name */
- void
- nautilus_freedesktop_dbus_start (NautilusApplication *app)
+ NautilusFreedesktopDBus *
+ nautilus_freedesktop_dbus_new (void)
 Index: nautilus/src/nautilus-freedesktop-dbus.h
 ===================================================================
---- nautilus.orig/src/nautilus-freedesktop-dbus.h	2013-03-27 14:24:02.345633000 +0100
-+++ nautilus/src/nautilus-freedesktop-dbus.h	2013-03-27 15:17:59.012454136 +0100
-@@ -28,5 +28,6 @@
- void nautilus_freedesktop_dbus_start (NautilusApplication *app);
- void nautilus_freedesktop_dbus_stop (void);
- void nautilus_freedesktop_dbus_set_open_locations (const gchar **locations);
-+void nautilus_freedesktop_dbus_set_open_locations_xids (GVariant *locations);
+--- nautilus.orig/src/nautilus-freedesktop-dbus.h	2013-06-10 21:00:24.913944953 +0200
++++ nautilus/src/nautilus-freedesktop-dbus.h	2013-06-10 21:00:24.909944954 +0200
+@@ -48,5 +48,6 @@
+ NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);
+ 
+ void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations);
++void nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb, GVariant *locations);
  
  #endif /* __NAUTILUS_FREEDESKTOP_DBUS_H__ */
 
=== removed file 'debian/patches/git_add_desktop_keywords.patch'
--- debian/patches/git_add_desktop_keywords.patch	2013-03-14 10:35:52 +0000
+++ debian/patches/git_add_desktop_keywords.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Index: nautilus/data/nautilus.desktop.in.in
-===================================================================
---- nautilus.orig/data/nautilus.desktop.in.in	2013-03-12 19:35:01.714349423 +0100
-+++ nautilus/data/nautilus.desktop.in.in	2013-03-12 19:37:25.077722944 +0100
-@@ -1,6 +1,7 @@
- [Desktop Entry]
- _Name=Files
- _Comment=Access and organize files
-+_Keywords=folder;manager;explore;disk;filesystem;
- Exec=nautilus --new-window %U
- Icon=system-file-manager
- Terminal=false
 
=== removed file 'debian/patches/git_add_missing_tooltips.patch'
--- debian/patches/git_add_missing_tooltips.patch	2012-10-31 07:02:17 +0000
+++ debian/patches/git_add_missing_tooltips.patch	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-From f017a93b9ba3a465059ebca8eeb79138c983bd96 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Fri, 26 Oct 2012 20:43:40 +0000
-Subject: toolbar: add missing tooltips for toolbar menubuttons
-
-These require new strings, so it's a separate commit from the previous
-one.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686903
----
-diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
-index 94be1c0..fbea52f 100644
---- a/src/nautilus-toolbar.c
-+++ b/src/nautilus-toolbar.c
-@@ -34,6 +34,7 @@
- #include <libnautilus-private/nautilus-global-preferences.h>
- #include <libnautilus-private/nautilus-ui-utilities.h>
- 
-+#include <glib/gi18n.h>
- #include <math.h>
- 
- typedef enum {
-@@ -100,7 +101,8 @@ static GtkWidget *
- toolbar_create_toolbutton (NautilusToolbar *self,
- 			   gboolean create_menu,
- 			   gboolean create_toggle,
--			   const gchar *name)
-+			   const gchar *name,
-+			   const gchar *tooltip)
- {
- 	GtkWidget *button, *image;
- 	GtkActionGroup *action_group;
-@@ -124,6 +126,7 @@ toolbar_create_toolbutton (NautilusToolbar *self,
- 	if (create_menu) {
- 		gtk_image_set_from_icon_name (GTK_IMAGE (image), name,
- 					      GTK_ICON_SIZE_MENU);
-+		gtk_widget_set_tooltip_text (button, tooltip);
- 	} else {
- 		action = gtk_action_group_get_action (action_group, name);
- 		gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
-@@ -357,12 +360,12 @@ nautilus_toolbar_constructed (GObject *obj)
- 	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- 
- 	/* Back */
--	tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_BACK);
-+	tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_BACK, NULL);
- 	navigation_button_setup_menu (self, tool_button, NAUTILUS_NAVIGATION_DIRECTION_BACK);
- 	gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
- 
- 	/* Forward */
--	tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_FORWARD);
-+	tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_FORWARD, NULL);
- 	navigation_button_setup_menu (self, tool_button, NAUTILUS_NAVIGATION_DIRECTION_FORWARD);
- 	gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
- 
-@@ -396,7 +399,7 @@ nautilus_toolbar_constructed (GObject *obj)
- 
- 	/* search */
- 	tool_item = gtk_tool_item_new ();
--	tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_SEARCH);
-+	tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_SEARCH, NULL);
- 	gtk_container_add (GTK_CONTAINER (tool_item), GTK_WIDGET (tool_button));
- 	gtk_container_add (GTK_CONTAINER (self->priv->toolbar), GTK_WIDGET (tool_item));
- 	gtk_widget_show_all (GTK_WIDGET (tool_item));
-@@ -406,11 +409,11 @@ nautilus_toolbar_constructed (GObject *obj)
- 	tool_item = gtk_tool_item_new ();
- 	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- 
--	tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_LIST);
-+	tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_LIST, NULL);
- 	gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
--	tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_GRID);
-+	tool_button = toolbar_create_toolbutton (self, FALSE, TRUE, NAUTILUS_ACTION_VIEW_GRID, NULL);
- 	gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
--	tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "go-down-symbolic");
-+	tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "go-down-symbolic", _("View options"));
- 	gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
- 	menu = gtk_ui_manager_get_widget (ui_manager, "/ViewMenu");
- 	gtk_menu_button_set_popup (GTK_MENU_BUTTON (tool_button), menu);
-@@ -427,7 +430,7 @@ nautilus_toolbar_constructed (GObject *obj)
- 
- 	/* Action Menu */
- 	tool_item = gtk_tool_item_new ();
--	tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "emblem-system-symbolic");
-+	tool_button = toolbar_create_toolbutton (self, TRUE, FALSE, "emblem-system-symbolic", _("Location options"));
- 	menu = gtk_ui_manager_get_widget (ui_manager, "/ActionMenu");
- 	gtk_widget_set_halign (menu, GTK_ALIGN_END);
- 	gtk_menu_button_set_popup (GTK_MENU_BUTTON (tool_button), menu);
 
=== removed file 'debian/patches/git_eel_needs_terminal.patch'
--- debian/patches/git_eel_needs_terminal.patch	2013-05-28 10:48:02 +0000
+++ debian/patches/git_eel_needs_terminal.patch	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-From 447d2ad6944afd94434a774b28f8c6e8274955fe Mon Sep 17 00:00:00 2001
-From: William Jon McCann <[e-mail]>
-Date: Fri, 15 Feb 2013 18:30:39 +0000
-Subject: eel: use G_APP_INFO_CREATE_NEEDS_TERMINAL to run command in terminal
-
----
-diff --git a/eel/eel-gnome-extensions.c b/eel/eel-gnome-extensions.c
-index eaddfe5..e7b8ecb 100644
---- a/eel/eel-gnome-extensions.c
-+++ b/eel/eel-gnome-extensions.c
-@@ -31,153 +31,19 @@
- #include "eel-gnome-extensions.h"
- 
- #include <gtk/gtk.h>
--#include <libgnome-desktop/gnome-desktop-utils.h>
- 
- /* Return a command string containing the path to a terminal on this system. */
- 
--static char *
--try_terminal_command (const char *program,
--		      const char *args)
--{
--	char *program_in_path, *quoted, *result;
--
--	if (program == NULL) {
--		return NULL;
--	}
--
--	program_in_path = g_find_program_in_path (program);
--	if (program_in_path == NULL) {
--		return NULL;
--	}
--
--	quoted = g_shell_quote (program_in_path);
--	g_free (program_in_path);
--	if (args == NULL || args[0] == '\0') {
--		return quoted;
--	}
--	result = g_strconcat (quoted, " ", args, NULL);
--	g_free (quoted);
--	return result;
--}
--
--static char *
--try_terminal_command_argv (int argc,
--			   char **argv)
--{
--	GString *string;
--	int i;
--	char *quoted, *result;
--
--	if (argc == 0) {
--		return NULL;
--	}
--
--	if (argc == 1) {
--		return try_terminal_command (argv[0], NULL);
--	}
--	
--	string = g_string_new (argv[1]);
--	for (i = 2; i < argc; i++) {
--		quoted = g_shell_quote (argv[i]);
--		g_string_append_c (string, ' ');
--		g_string_append (string, quoted);
--		g_free (quoted);
--	}
--	result = try_terminal_command (argv[0], string->str);
--	g_string_free (string, TRUE);
--
--	return result;
--}
--
--static char *
--get_terminal_command_prefix (gboolean for_command)
--{
--	int argc;
--	char **argv;
--	char *command;
--	guint i;
--	static const char *const commands[][3] = {
--		{ "gnome-terminal", "-x",                                      "" },
--		{ "dtterm",         "-e",                                      "-ls" },
--		{ "nxterm",         "-e",                                      "-ls" },
--		{ "color-xterm",    "-e",                                      "-ls" },
--		{ "rxvt",           "-e",                                      "-ls" },
--		{ "xterm",          "-e",                                      "-ls" },
--	};
--
--	/* Try the terminal from preferences. Use without any
--	 * arguments if we are just doing a standalone terminal.
--	 */
--	argc = 0;
--	argv = g_new0 (char *, 1);
--	gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
--
--	command = NULL;
--	if (argc != 0) {
--		if (for_command) {
--			command = try_terminal_command_argv (argc, argv);
--		} else {
--			/* Strip off the arguments in a lame attempt
--			 * to make it be an interactive shell.
--			 */
--			command = try_terminal_command (argv[0], NULL);
--		}
--	}
--
--	while (argc != 0) {
--		g_free (argv[--argc]);
--	}
--	g_free (argv);
--
--	if (command != NULL) {
--		return command;
--	}
--
--	/* Try well-known terminal applications in same order that gmc did. */
--	for (i = 0; i < G_N_ELEMENTS (commands); i++) {
--		command = try_terminal_command (commands[i][0],
--						commands[i][for_command ? 1 : 2]);
--		if (command != NULL) {
--			break;
--		}
--	}
--	
--	return command;
--}
--
--static char *
--eel_gnome_make_terminal_command (const char *command)
--{
--	char *prefix, *quoted, *terminal_command;
--
--	if (command == NULL) {
--		return get_terminal_command_prefix (FALSE);
--	}
--	prefix = get_terminal_command_prefix (TRUE);
--	quoted = g_shell_quote (command);
--	terminal_command = g_strconcat (prefix, " /bin/sh -c ", quoted, NULL);
--	g_free (prefix);
--	g_free (quoted);
--	return terminal_command;
--}
--
- void
- eel_gnome_open_terminal_on_screen (const char *command,
- 				   GdkScreen  *screen)
- {
--	char *command_line;
- 	GAppInfo *app;
- 	GdkAppLaunchContext *ctx;
- 	GError *error = NULL;
- 	GdkDisplay *display;
- 
--	command_line = eel_gnome_make_terminal_command (command);
--	if (command_line == NULL) {
--		g_message ("Could not start a terminal");
--		return;
--	}
--
--	app = g_app_info_create_from_commandline (command_line, NULL, 0, &error);
-+	app = g_app_info_create_from_commandline (command, NULL, G_APP_INFO_CREATE_NEEDS_TERMINAL, &error);
- 
- 	if (app != NULL && screen != NULL) {
- 		display = gdk_screen_get_display (screen);
-@@ -195,6 +61,4 @@ eel_gnome_open_terminal_on_screen (const char *command,
- 
- 		g_error_free (error);
- 	}
--
--	g_free (command_line);
- }
---
-cgit v0.9.1
-
 
=== removed file 'debian/patches/git_enable_copy_from_recent.patch'
--- debian/patches/git_enable_copy_from_recent.patch	2013-04-04 23:22:13 +0000
+++ debian/patches/git_enable_copy_from_recent.patch	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-From b61e1d03b42723e13cf7dd05a26c9bd92dbac0ce Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Wed, 03 Apr 2013 22:08:09 +0000
-Subject: view: allow copying, and not cutting, from Recent Files
-
-Previously, we enabled the Cut action for the Recent location, and kept
-Copy and Copy To disabled. This should be the other way around, as
-copying a file from there is a valid option, whereas cutting/moving it
-doesn't make sense, being a virtual location.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690138
----
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index 6b1bed2..357da27 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -8386,6 +8386,7 @@ real_update_menus (NautilusView *view)
- 	gboolean selection_contains_recent;
- 	gboolean can_create_files;
- 	gboolean can_delete_files;
-+	gboolean can_move_files;
- 	gboolean can_trash_files;
- 	gboolean can_copy_files;
- 	gboolean can_link_files;
-@@ -8422,9 +8423,9 @@ real_update_menus (NautilusView *view)
- 		!selection_contains_special_link &&
- 		!selection_contains_desktop_or_home_dir;
- 	can_copy_files = selection_count != 0
--		&& !selection_contains_recent
- 		&& !selection_contains_special_link;
- 
-+	can_move_files = can_delete_files && !selection_contains_recent;
- 	can_link_files = can_create_files && can_copy_files;
- 
- 	action = gtk_action_group_get_action (view->details->dir_action_group,
-@@ -8717,7 +8718,7 @@ real_update_menus (NautilusView *view)
- 
- 	action = gtk_action_group_get_action (view->details->dir_action_group,
- 					      NAUTILUS_ACTION_CUT);
--	gtk_action_set_sensitive (action, can_delete_files);
-+	gtk_action_set_sensitive (action, can_move_files);
- 	gtk_action_set_visible (action, !selection_contains_recent);
- 
- 	action = gtk_action_group_get_action (view->details->dir_action_group,
-@@ -8749,10 +8750,10 @@ real_update_menus (NautilusView *view)
- 	action = gtk_action_group_get_action (view->details->dir_action_group,
- 					      NAUTILUS_ACTION_COPY_TO);
- 	gtk_action_set_sensitive (action, can_copy_files);
--	gtk_action_set_visible (action, !selection_contains_recent);
-+
- 	action = gtk_action_group_get_action (view->details->dir_action_group,
- 					      NAUTILUS_ACTION_MOVE_TO);
--	gtk_action_set_sensitive (action, can_delete_files);
-+	gtk_action_set_sensitive (action, can_move_files);
- 	gtk_action_set_visible (action, !selection_contains_recent);
- 
- 	action = gtk_action_group_get_action (view->details->dir_action_group, NAUTILUS_ACTION_SHOW_HIDDEN_FILES);
-
 
=== removed file 'debian/patches/git_enable_simple_search_engine.patch'
--- debian/patches/git_enable_simple_search_engine.patch	2013-03-22 17:44:56 +0000
+++ debian/patches/git_enable_simple_search_engine.patch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-From f65d3e15916a12fe2fe35b63e862b9f9d20920bf Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Mon, 22 Oct 2012 22:59:38 +0000
-Subject: search-directory: always start the simple engine
-
-This is needed to load results incrementally, which will be done in a
-separate commit.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=325146
----
-diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
-index fbeabe0..c92b745 100644
---- a/libnautilus-private/nautilus-search-engine.c
-+++ b/libnautilus-private/nautilus-search-engine.c
-@@ -92,10 +92,10 @@ search_engine_start_real (NautilusSearchEngine *engine)
- 	if (nautilus_search_engine_model_get_model (engine->details->model)) {
- 		nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->model));
- 		engine->details->providers_running++;
--	} else {
--		nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->simple));
--		engine->details->providers_running++;
- 	}
-+
-+	nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (engine->details->simple));
-+	engine->details->providers_running++;
- }
- 
- static void
---
-cgit v0.9.1
-
 
=== removed file 'debian/patches/git_export_opened_locations_on_dbus.patch'
--- debian/patches/git_export_opened_locations_on_dbus.patch	2013-03-14 10:35:52 +0000
+++ debian/patches/git_export_opened_locations_on_dbus.patch	1970-01-01 00:00:00 +0000
@@ -1,261 +0,0 @@
-Description: Add a new dbus property to the nautilus'
- "org.freedesktop.FileManager1" dbus interface where it stores a list of
- currently opened locations.
-
-Origin: upstream, https://git.gnome.org/browse/nautilus/commit/?id=e6fecc0500b83
- https://git.gnome.org/browse/nautilus/commit/?id=980512c
- https://git.gnome.org/browse/nautilus/commit/?id=49115b85
- https://git.gnome.org/browse/nautilus/commit/?id=b8eebe95
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694266
-Bug-Ubuntu: https://bugs.launchpad.net/nautilus/+bug/1063830
-Forwarded: yes
-Applied-Upstream: 3.7.91
-Author: Marco Trevisan <[e-mail]>
-
-Index: nautilus/src/nautilus-application.c
-===================================================================
---- nautilus.orig/src/nautilus-application.c	2013-03-13 01:08:30.906653182 +0100
-+++ nautilus/src/nautilus-application.c	2013-03-13 01:27:30.152464886 +0100
-@@ -524,7 +524,7 @@
- 	g_return_val_if_fail (NAUTILUS_IS_APPLICATION (application), NULL);
- 	nautilus_profile_start (NULL);
- 
--	window = nautilus_window_new (GTK_APPLICATION (application), screen);
-+	window = nautilus_window_new (screen);
- 
- 	maximized = g_settings_get_boolean
- 		(nautilus_window_state, NAUTILUS_WINDOW_STATE_MAXIMIZED);
-@@ -1579,6 +1579,98 @@
- }
- 
- static void
-+update_dbus_opened_locations (NautilusApplication *app)
-+{
-+	gint i;
-+	GList *l, *sl;
-+	GList *locations = NULL;
-+	gsize locations_size = 0;
-+	gchar **locations_array;
-+
-+	g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
-+
-+	for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = l->next) {
-+		NautilusWindow *win = NAUTILUS_WINDOW (l->data);
-+
-+		if (NAUTILUS_IS_DESKTOP_WINDOW (win)) {
-+			continue;
-+		}
-+
-+		for (sl = nautilus_window_get_slots (win); sl; sl = sl->next) {
-+			NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (sl->data);
-+			gchar *uri = nautilus_window_slot_get_location_uri (slot);
-+
-+			if (uri) {
-+				GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
-+
-+				if (!found) {
-+					locations = g_list_prepend (locations, uri);
-+					++locations_size;
-+				} else {
-+					g_free (uri);
-+				}
-+			}
-+		}
-+	}
-+
-+	locations_array = g_new (gchar*, locations_size + 1);
-+
-+	for (i = 0, l = locations; l; l = l->next, ++i) {
-+		/* We reuse the locations string locations saved on list */
-+		locations_array[i] = l->data;
-+	}
-+
-+	locations_array[locations_size] = NULL;
-+
-+	nautilus_freedesktop_dbus_set_open_locations ((const gchar**) locations_array);
-+
-+	g_free (locations_array);
-+	g_list_free_full (locations, g_free);
-+}
-+
-+static void
-+on_slot_location_changed (NautilusWindowSlot *slot,
-+			  const char         *from,
-+ 			  const char         *to,
-+			  NautilusApplication *application)
-+{
-+	update_dbus_opened_locations (application);
-+}
-+
-+static void
-+on_slot_added (NautilusWindow      *window,
-+	       NautilusWindowSlot  *slot,
-+	       NautilusApplication *application)
-+{
-+	if (nautilus_window_slot_get_location (slot)) {
-+		update_dbus_opened_locations (application);
-+	}
-+
-+	g_signal_connect (slot, "location-changed", G_CALLBACK (on_slot_location_changed), application);
-+}
-+
-+static void
-+on_slot_removed (NautilusWindow      *window,
-+		 NautilusWindowSlot  *slot,
-+		 NautilusApplication *application)
-+{
-+	update_dbus_opened_locations (application);
-+
-+	g_signal_handlers_disconnect_by_func (slot, on_slot_location_changed, application);
-+}
-+
-+static void
-+nautilus_application_window_added (GtkApplication *app,
-+				   GtkWindow *window)
-+{
-+	/* chain to parent */
-+	GTK_APPLICATION_CLASS (nautilus_application_parent_class)->window_added (app, window);
-+
-+	g_signal_connect (window, "slot-added", G_CALLBACK (on_slot_added), app);
-+	g_signal_connect (window, "slot-removed", G_CALLBACK (on_slot_removed), app);
-+}
-+
-+static void
- nautilus_application_window_removed (GtkApplication *app,
- 				     GtkWindow *window)
- {
-@@ -1592,6 +1684,9 @@
- 		previewer = nautilus_previewer_get_singleton ();
- 		nautilus_previewer_call_close (previewer);
- 	}
-+
-+	g_signal_handlers_disconnect_by_func (window, on_slot_added, app);
-+	g_signal_handlers_disconnect_by_func (window, on_slot_removed, app);
- }
- 
- static void
-@@ -1611,6 +1706,7 @@
- 	application_class->local_command_line = nautilus_application_local_command_line;
- 
- 	gtkapp_class = GTK_APPLICATION_CLASS (class);
-+	gtkapp_class->window_added = nautilus_application_window_added;
- 	gtkapp_class->window_removed = nautilus_application_window_removed;
- 
- 	g_type_class_add_private (class, sizeof (NautilusApplicationPriv));
-Index: nautilus/src/nautilus-window.c
-===================================================================
---- nautilus.orig/src/nautilus-window.c	2013-03-13 01:08:43.558919000 +0100
-+++ nautilus/src/nautilus-window.c	2013-03-13 01:29:17.256160975 +0100
-@@ -1119,6 +1119,7 @@
- static void
- nautilus_window_constructed (GObject *self)
- {
-+	NautilusApplication *application;
- 	NautilusWindow *window;
- 	GtkWidget *grid;
- 	NautilusWindowSlot *slot;
-@@ -1129,6 +1130,9 @@
- 
- 	G_OBJECT_CLASS (nautilus_window_parent_class)->constructed (self);
- 
-+	application = NAUTILUS_APPLICATION (g_application_get_default ());
-+	gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application));
-+
- 	/* disable automatic menubar handling, since we show our regular
- 	 * menubar together with the app menu.
- 	 */
-@@ -2028,11 +2032,9 @@
- }
- 
- NautilusWindow *
--nautilus_window_new (GtkApplication *application,
--		     GdkScreen      *screen)
-+nautilus_window_new (GdkScreen *screen)
- {
- 	return g_object_new (NAUTILUS_TYPE_WINDOW,
--			     "application", application,
- 			     "screen", screen,
- 			     NULL);
- }
-Index: nautilus/data/freedesktop-dbus-interfaces.xml
-===================================================================
---- nautilus.orig/data/freedesktop-dbus-interfaces.xml	2013-03-12 13:22:34.506542000 +0100
-+++ nautilus/data/freedesktop-dbus-interfaces.xml	2013-03-13 01:14:24.283872283 +0100
-@@ -32,5 +32,6 @@
-       <arg type='as' name='URIs' direction='in'/>
-       <arg type='s' name='StartupId' direction='in'/>
-     </method>
-+    <property name="OpenLocations" type="as" access="read"/>
-   </interface>
- </node>
-Index: nautilus/src/nautilus-freedesktop-dbus.c
-===================================================================
---- nautilus.orig/src/nautilus-freedesktop-dbus.c	2013-03-12 13:22:34.506542000 +0100
-+++ nautilus/src/nautilus-freedesktop-dbus.c	2013-03-13 01:27:53.096401970 +0100
-@@ -295,6 +295,14 @@
- 	/* nothing */
- }
- 
-+void
-+nautilus_freedesktop_dbus_set_open_locations (const gchar **locations)
-+{
-+	g_return_if_fail (singleton);
-+
-+	nautilus_freedesktop_file_manager1_set_open_locations (singleton->skeleton, locations);
-+}
-+
- /* Tries to own the org.freedesktop.FileManager1 service name */
- void
- nautilus_freedesktop_dbus_start (NautilusApplication *app)
-Index: nautilus/src/nautilus-freedesktop-dbus.h
-===================================================================
---- nautilus.orig/src/nautilus-freedesktop-dbus.h	2013-03-12 13:22:34.506542000 +0100
-+++ nautilus/src/nautilus-freedesktop-dbus.h	2013-03-13 01:17:19.716808253 +0100
-@@ -27,5 +27,6 @@
- 
- void nautilus_freedesktop_dbus_start (NautilusApplication *app);
- void nautilus_freedesktop_dbus_stop (void);
-+void nautilus_freedesktop_dbus_set_open_locations (const gchar **locations);
- 
- #endif /* __NAUTILUS_FREEDESKTOP_DBUS_H__ */
-Index: nautilus/src/nautilus-window-manage-views.c
-===================================================================
---- nautilus.orig/src/nautilus-window-manage-views.c	2013-03-12 19:34:31.062512185 +0100
-+++ nautilus/src/nautilus-window-manage-views.c	2013-03-13 01:24:32.876892020 +0100
-@@ -1405,6 +1405,7 @@
- update_for_new_location (NautilusWindowSlot *slot)
- {
- 	NautilusWindow *window;
-+	    GFile *old_location;
-         GFile *new_location;
-         NautilusFile *file;
- 	NautilusDirectory *directory;
-@@ -1424,11 +1425,11 @@
- 		slot->location == NULL ||
- 		!g_file_equal (slot->location, new_location);
- 
--	nautilus_window_slot_emit_location_change (slot, slot->location, new_location);
--
-         /* Set the new location. */
--	g_clear_object (&slot->location);
-+	old_location = slot->location;
- 	slot->location = new_location;
-+	nautilus_window_slot_emit_location_change (slot, old_location, new_location);
-+	g_clear_object (&old_location);
- 
-         /* Create a NautilusFile for this location, so we can catch it
-          * if it goes away.
-Index: nautilus/src/nautilus-window.h
-===================================================================
---- nautilus.orig/src/nautilus-window.h	2013-03-13 01:08:30.934652783 +0100
-+++ nautilus/src/nautilus-window.h	2013-03-13 01:08:55.798311025 +0100
-@@ -93,8 +93,7 @@
- };
- 
- GType            nautilus_window_get_type             (void);
--NautilusWindow * nautilus_window_new                  (GtkApplication    *application,
--                                                       GdkScreen         *screen);
-+NautilusWindow * nautilus_window_new                  (GdkScreen         *screen);
- void             nautilus_window_close                (NautilusWindow    *window);
- 
- void             nautilus_window_connect_content_view (NautilusWindow    *window,
 
=== removed file 'debian/patches/git_fix_touch_double_click.patch'
--- debian/patches/git_fix_touch_double_click.patch	2013-03-06 17:49:53 +0000
+++ debian/patches/git_fix_touch_double_click.patch	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-Subject: [PATCH] eel-canvas: fix double tap with touchscreen devices
-
-Code here is not doing what the comment (and the symmetric part in
-the RELEASE case) says.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=688281
----
- eel/eel-canvas.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
-index 4fdef13..7ebd6cc 100644
---- a/eel/eel-canvas.c
-+++ b/eel/eel-canvas.c
-@@ -2668,9 +2668,11 @@ eel_canvas_button (GtkWidget *widget, GdkEventButton *event)
- 		/* Pick the current item as if the button were not pressed, and
- 		 * then process the event.
- 		 */
-+		event->state ^= mask;
- 		canvas->state = event->state;
- 		pick_current_item (canvas, (GdkEvent *) event);
--		canvas->state ^= mask;
-+		event->state ^= mask;
-+		canvas->state = event->state;
- 		retval = emit_event (canvas, (GdkEvent *) event);
- 		break;
- 
--- 
-1.8.1.2
 
=== removed file 'debian/patches/git_launcher_no_frame.patch'
--- debian/patches/git_launcher_no_frame.patch	2012-12-03 14:38:18 +0000
+++ debian/patches/git_launcher_no_frame.patch	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-From 6cde4c5a6d639c85df09b8992a307f91d6b056a6 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Tue, 13 Nov 2012 13:16:17 +0000
-Subject: file: don't add a thumbnail border around desktop file launchers
-
-https://bugzilla.gnome.org/show_bug.cgi?id=688237
----
-diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
-index e9b7715..d554376 100644
---- a/libnautilus-private/nautilus-file.c
-+++ b/libnautilus-private/nautilus-file.c
-@@ -3953,6 +3953,18 @@ get_custom_icon_metadata_name (NautilusFile *file)
- }
- 
- static GIcon *
-+get_link_icon (NautilusFile *file)
-+{
-+	GIcon *icon = NULL;
-+
-+	if (file->details->got_link_info && file->details->custom_icon != NULL) {
-+		icon = g_object_ref (file->details->custom_icon);
-+	}
-+
-+	return icon;
-+}
-+
-+static GIcon *
- get_custom_icon (NautilusFile *file)
- {
- 	char *custom_icon_uri, *custom_icon_name;
-@@ -3985,11 +3997,7 @@ get_custom_icon (NautilusFile *file)
- 			g_free (custom_icon_name);
- 		}
- 	}
-- 
--	if (icon == NULL && file->details->got_link_info && file->details->custom_icon != NULL) {
--		icon = g_object_ref (file->details->custom_icon);
-- 	}
-- 
-+
- 	return icon;
- }
- 
-@@ -4086,6 +4094,12 @@ nautilus_file_get_gicon (NautilusFile *file,
- 		return icon;
- 	}
- 
-+	icon = get_link_icon (file);
-+
-+	if (icon != NULL) {
-+		return icon;
-+	}
-+
- 	if (file->details->icon) {
- 		icon = NULL;
- 
-@@ -4218,27 +4232,36 @@ nautilus_file_get_icon (NautilusFile *file,
- {
- 	NautilusIconInfo *icon;
- 	GIcon *gicon;
-+	gboolean custom_icon;
- 	GdkPixbuf *raw_pixbuf, *scaled_pixbuf;
- 	int modified_size;
- 
- 	if (file == NULL) {
- 		return NULL;
- 	}
--	
-+
-+	custom_icon = FALSE;
- 	gicon = get_custom_icon (file);
-+
- 	if (gicon) {
--		GdkPixbuf *pixbuf;
-+		custom_icon = TRUE;
-+	} else {
-+		gicon = get_link_icon (file);
-+	}
- 
-+	if (gicon) {
- 		icon = nautilus_icon_info_lookup (gicon, size);
- 		g_object_unref (gicon);
- 
--		pixbuf = nautilus_icon_info_get_pixbuf (icon);
--		if (pixbuf != NULL) {
--			nautilus_ui_frame_image (&pixbuf);
--			g_object_unref (icon);
-+		if (custom_icon) {
-+			raw_pixbuf = nautilus_icon_info_get_pixbuf (icon);
-+			if (raw_pixbuf != NULL) {
-+				nautilus_ui_frame_image (&raw_pixbuf);
-+				g_object_unref (icon);
- 
--			icon = nautilus_icon_info_new_for_pixbuf (pixbuf);
--			g_object_unref (pixbuf);
-+				icon = nautilus_icon_info_new_for_pixbuf (raw_pixbuf);
-+				g_object_unref (raw_pixbuf);
-+			}
- 		}
- 
- 		return icon;
---
-cgit v0.9.0.2
 
=== removed file 'debian/patches/git_margin_primary_workarea_revert.patch'
--- debian/patches/git_margin_primary_workarea_revert.patch	2013-03-20 17:59:04 +0000
+++ debian/patches/git_margin_primary_workarea_revert.patch	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-From 6f6fcf1b4e99c8a5186c78e911a159b1f06df7b0 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Tue, 19 Mar 2013 23:25:37 +0000
-Subject: Revert "desktop-canvas: set margins according to the primary workarea"
-
-This fix proved to be more problematic than the original bug, so we'll
-revert to the original behavior for now.
-
-This reverts commit 1292610b87be44fcd5a7d5a09738cd7f3287325f.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=695336
----
-diff --git a/src/nautilus-desktop-canvas-view.c b/src/nautilus-desktop-canvas-view.c
-index fb75139..75287ec 100644
---- a/src/nautilus-desktop-canvas-view.c
-+++ b/src/nautilus-desktop-canvas-view.c
-@@ -99,27 +99,27 @@ canvas_container_set_workarea (NautilusCanvasContainer *canvas_container,
- 			     int                    n_items)
- {
- 	int left, right, top, bottom;
-+	int screen_width, screen_height;
- 	int i;
--	GdkRectangle geometry;
- 
- 	left = right = top = bottom = 0;
--	gdk_screen_get_monitor_geometry (screen, gdk_screen_get_primary_monitor (screen), &geometry);
- 
--	for (i = 0; i < n_items; i += 4) {
--		GdkRectangle workarea;
-+	screen_width  = gdk_screen_get_width (screen);
-+	screen_height = gdk_screen_get_height (screen);
- 
--		workarea.x = workareas[i];
--		workarea.y = workareas[i + 1];
--		workarea.width = workareas[i + 2];
--		workarea.height = workareas[i + 3];
-+	for (i = 0; i < n_items; i += 4) {
-+		int x      = workareas [i];
-+		int y      = workareas [i + 1];
-+		int width  = workareas [i + 2];
-+		int height = workareas [i + 3];
- 
--		if (!gdk_rectangle_intersect (&geometry, &workarea, &workarea))
-+		if ((x + width) > screen_width || (y + height) > screen_height)
- 			continue;
- 
--		left   = MAX (left, workarea.x);
--		right  = MAX (right, (geometry.x + geometry.width) - (workarea.x + workarea.width));
--		top    = MAX (top, workarea.y);
--		bottom = MAX (bottom, (geometry.y + geometry.height) - (workarea.y + workarea.height));
-+		left   = MAX (left, x);
-+		right  = MAX (right, screen_width - width - x);
-+		top    = MAX (top, y);
-+		bottom = MAX (bottom, screen_height - height - y);
- 	}
- 
- 	nautilus_canvas_container_set_margins (canvas_container,
---
-cgit v0.9.1
-
 
=== removed file 'debian/patches/git_rank_exact_matches_higher.patch'
--- debian/patches/git_rank_exact_matches_higher.patch	2013-04-16 10:17:12 +0000
+++ debian/patches/git_rank_exact_matches_higher.patch	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-From 8d0ae533c01fc785c097329f2e7f9a3faf686b6d Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Thu, 04 Apr 2013 21:59:31 +0000
-Subject: query: rank prefix matches lower than exact matches
-
-Count how many letters are left after the string occurrence, and
-subtract that from the match score.
----
-diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c
-index 1393cd0..f282b0c 100644
---- a/libnautilus-private/nautilus-query.c
-+++ b/libnautilus-private/nautilus-query.c
-@@ -96,7 +96,7 @@ nautilus_query_matches_string (NautilusQuery *query,
- 	gchar *prepared_string, *ptr;
- 	gboolean found;
- 	gdouble retval;
--	gint idx;
-+	gint idx, nonexact_malus;
- 
- 	if (!query->details->text) {
- 		return -1;
-@@ -111,12 +111,15 @@ nautilus_query_matches_string (NautilusQuery *query,
- 	prepared_string = prepare_string_for_compare (string);
- 	found = TRUE;
- 	ptr = NULL;
-+	nonexact_malus = 0;
- 
- 	for (idx = 0; query->details->prepared_words[idx] != NULL; idx++) {
- 		if ((ptr = strstr (prepared_string, query->details->prepared_words[idx])) == NULL) {
- 			found = FALSE;
- 			break;
- 		}
-+
-+		nonexact_malus += strlen (ptr) - strlen (query->details->prepared_words[idx]);
- 	}
- 
- 	if (!found) {
-@@ -124,7 +127,7 @@ nautilus_query_matches_string (NautilusQuery *query,
- 		return -1;
- 	}
- 
--	retval = MAX (10.0, (50.0 / idx) - (gdouble) (ptr - prepared_string));
-+	retval = MAX (10.0, 50.0 - (gdouble) (ptr - prepared_string) - nonexact_malus);
- 	g_free (prepared_string);
- 
- 	return retval;
---
-cgit v0.9.1
-
 
=== removed file 'debian/patches/git_rank_reversed.patch'
--- debian/patches/git_rank_reversed.patch	2013-04-16 10:17:12 +0000
+++ debian/patches/git_rank_reversed.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-From 771d497088bdc7c6c8be3c6a38f815c8ad531fca Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Fri, 05 Apr 2013 00:01:35 +0000
-Subject: file: do not reverse collated order for files with same search rank
-
-When two search results rank equally, we fall back to the collated
-order.
-Since search is usually ranked reversed (highest at the top), we need to
-ensure we don't accidentally reverse the collated order as well.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=688772
----
-diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
-index 60a1954..35235e1 100644
---- a/libnautilus-private/nautilus-file.c
-+++ b/libnautilus-private/nautilus-file.c
-@@ -3191,6 +3191,9 @@ nautilus_file_compare_for_sort (NautilusFile *file_1,
- 			result = compare_by_search_relevance (file_1, file_2);
- 			if (result == 0) {
- 				result = compare_by_full_path (file_1, file_2);
-+
-+				/* ensure alphabetical order for files of the same relevance */
-+				reversed = FALSE;
- 			}
- 			break;
- 		default:
 
=== removed file 'debian/patches/git_reset_view_to_defaults.patch'
--- debian/patches/git_reset_view_to_defaults.patch	2013-04-16 10:17:12 +0000
+++ debian/patches/git_reset_view_to_defaults.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-From 7ec5b026f5d1afe52e8c046b329ef30d7d3bc0a5 Mon Sep 17 00:00:00 2001
-From: Michael Wood <[e-mail]>
-Date: Wed, 10 Apr 2013 15:57:05 +0000
-Subject: view: Make sure we chain down to call reset_to_defaults on the view.
-
----
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index 357da27..4441c40 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -474,6 +474,7 @@
- 					      NAUTILUS_ACTION_SHOW_HIDDEN_FILES);
- 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
- 				      g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES));
-+	NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->reset_to_defaults (view);
- }
- 
- static gboolean
 
=== removed file 'debian/patches/git_restore_filename.patch'
--- debian/patches/git_restore_filename.patch	2012-12-03 14:37:29 +0000
+++ debian/patches/git_restore_filename.patch	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-From ecee8be850b8342c804de2ecc3e613b99a20a010 Mon Sep 17 00:00:00 2001
-From: Timothy Arceri <[e-mail]>
-Date: Thu, 29 Nov 2012 06:39:36 +0000
-Subject: Make sure to use correct filename when restoring from Trash
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673598
----
-diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
-index b60b748..85d5a6f 100644
---- a/libnautilus-private/nautilus-file-operations.c
-+++ b/libnautilus-private/nautilus-file-operations.c
-@@ -3258,18 +3258,28 @@ get_target_file_with_custom_name (GFile *src,
- 
- 	if (dest == NULL && !same_fs) {
- 		info = g_file_query_info (src,
--					  G_FILE_ATTRIBUTE_STANDARD_COPY_NAME,
-+					  G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
-+					  G_FILE_ATTRIBUTE_TRASH_ORIG_PATH,
- 					  0, NULL, NULL);
- 		
- 		if (info) {
--			copyname = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME));
-+			copyname = NULL;
-+
-+			/* if file is being restored from trash make sure it uses its original name */
-+			if (g_file_has_uri_scheme (src, "trash")) {
-+				copyname = g_strdup (g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
-+			}
-+
-+			if (copyname == NULL) {
-+				copyname = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME));
-+			}
- 
- 			if (copyname) {
- 				make_file_name_valid_for_dest_fs (copyname, dest_fs_type);
- 				dest = g_file_get_child_for_display_name (dest_dir, copyname, NULL);
- 				g_free (copyname);
- 			}
--			
-+
- 			g_object_unref (info);
- 		}
- 	}
---
-cgit v0.9.0.2
-
 
=== removed file 'debian/patches/git_restore_from_missing_directories.patch'
--- debian/patches/git_restore_from_missing_directories.patch	2013-04-04 23:48:07 +0000
+++ debian/patches/git_restore_from_missing_directories.patch	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-From f1cb32831df32009f7e8bd5fcc35c5ccdf64eee4 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Tue, 19 Mar 2013 09:30:45 +0000
-Subject: file-utils: ensure directories exist before restoring from trash
-
-Before restoring a file from trash, ensure its target directory exists on
-disk, otherwise the restore operation will fail trying to move a file to
-a nonexistent location.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=695460
----
-diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
-index 2b779a1..a28f961 100644
---- a/libnautilus-private/nautilus-file-utilities.c
-+++ b/libnautilus-private/nautilus-file-utilities.c
-@@ -1160,15 +1160,92 @@ locations_from_file_list (GList *file_list)
- 	return g_list_reverse (ret);
- }
- 
-+typedef struct {
-+	GHashTable *original_dirs_hash;
-+	GtkWindow  *parent_window;
-+} RestoreFilesData;
-+
-+static void
-+ensure_dirs_task_ready_cb (GObject *_source,
-+			   GAsyncResult *res,
-+			   gpointer user_data)
-+{
-+	NautilusFile *original_dir;
-+	GFile *original_dir_location;
-+	GList *original_dirs, *files, *locations, *l;
-+	RestoreFilesData *data = user_data;
-+
-+	original_dirs = g_hash_table_get_keys (data->original_dirs_hash);
-+	for (l = original_dirs; l != NULL; l = l->next) {
-+		original_dir = NAUTILUS_FILE (l->data);
-+		original_dir_location = nautilus_file_get_location (original_dir);
-+
-+		files = g_hash_table_lookup (data->original_dirs_hash, original_dir);
-+		locations = locations_from_file_list (files);
-+
-+		nautilus_file_operations_move
-+			(locations, NULL,
-+			 original_dir_location,
-+			 data->parent_window,
-+			 NULL, NULL);
-+
-+		g_list_free_full (locations, g_object_unref);
-+		g_object_unref (original_dir_location);
-+	}
-+
-+	g_list_free (original_dirs);
-+
-+	g_hash_table_unref (data->original_dirs_hash);
-+	g_slice_free (RestoreFilesData, data);
-+}
-+
-+static void
-+ensure_dirs_task_thread_func (GTask *task,
-+			      gpointer source,
-+			      gpointer task_data,
-+			      GCancellable *cancellable)
-+{
-+	RestoreFilesData *data = task_data;
-+	NautilusFile *original_dir;
-+	GFile *original_dir_location;
-+	GList *original_dirs, *l;
-+
-+	original_dirs = g_hash_table_get_keys (data->original_dirs_hash);
-+	for (l = original_dirs; l != NULL; l = l->next) {
-+		original_dir = NAUTILUS_FILE (l->data);
-+		original_dir_location = nautilus_file_get_location (original_dir);
-+
-+		g_file_make_directory_with_parents (original_dir_location, cancellable, NULL);
-+		g_object_unref (original_dir_location);
-+	}
-+
-+	g_task_return_pointer (task, NULL, NULL);
-+}
-+
-+static void
-+restore_files_ensure_parent_directories (GHashTable *original_dirs_hash,
-+					 GtkWindow  *parent_window)
-+{
-+	RestoreFilesData *data;
-+	GTask *ensure_dirs_task;
-+
-+	data = g_slice_new0 (RestoreFilesData);
-+	data->parent_window = parent_window;
-+	data->original_dirs_hash = g_hash_table_ref (original_dirs_hash);
-+
-+	ensure_dirs_task = g_task_new (NULL, NULL, ensure_dirs_task_ready_cb, data);
-+	g_task_set_task_data (ensure_dirs_task, data, NULL);
-+	g_task_run_in_thread (ensure_dirs_task, ensure_dirs_task_thread_func);
-+	g_object_unref (ensure_dirs_task);
-+}
-+
- void
- nautilus_restore_files_from_trash (GList *files,
- 				   GtkWindow *parent_window)
- {
--	NautilusFile *file, *original_dir;
-+	NautilusFile *file;
- 	GHashTable *original_dirs_hash;
--	GList *original_dirs, *unhandled_files;
--	GFile *original_dir_location;
--	GList *locations, *l;
-+	GList *unhandled_files, *l;
- 	char *message, *file_name;
- 
- 	original_dirs_hash = nautilus_trashed_files_get_original_directories (files, &unhandled_files);
-@@ -1186,26 +1263,8 @@ nautilus_restore_files_from_trash (GList *files,
- 	}
- 
- 	if (original_dirs_hash != NULL) {
--		original_dirs = g_hash_table_get_keys (original_dirs_hash);
--		for (l = original_dirs; l != NULL; l = l->next) {
--			original_dir = NAUTILUS_FILE (l->data);
--			original_dir_location = nautilus_file_get_location (original_dir);
--
--			files = g_hash_table_lookup (original_dirs_hash, original_dir);
--			locations = locations_from_file_list (files);
--
--			nautilus_file_operations_move
--				(locations, NULL, 
--				 original_dir_location,
--				 parent_window,
--				 NULL, NULL);
--
--			g_list_free_full (locations, g_object_unref);
--			g_object_unref (original_dir_location);
--		}
--
--		g_list_free (original_dirs);
--		g_hash_table_destroy (original_dirs_hash);
-+		restore_files_ensure_parent_directories (original_dirs_hash, parent_window);
-+		g_hash_table_unref (original_dirs_hash);
- 	}
- 
- 	nautilus_file_list_unref (unhandled_files);
-
 
=== removed file 'debian/patches/git_reuse_already_opened_views.patch'
--- debian/patches/git_reuse_already_opened_views.patch	2013-03-14 10:35:52 +0000
+++ debian/patches/git_reuse_already_opened_views.patch	1970-01-01 00:00:00 +0000
@@ -1,302 +0,0 @@
-Description: Focus already opened nautilus windows or tabs when an already
- opened location is requested. Add a --new-window command to force the opening
- of a new window.
-
-Origin: upstream, https://git.gnome.org/browse/nautilus/commit/?id=c8ee0c5
- https://git.gnome.org/browse/nautilus/commit/?id=d0b0b
- https://git.gnome.org/browse/nautilus/commit/?id=ce4255cf
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694034
-Bug-Ubuntu: https://bugs.launchpad.net/nautilus/+bug/692444
-Forwarded: yes
-Applied-Upstream: 3.7.91
-Author: Marco Trevisan <[e-mail]>
-
-Index: nautilus/data/nautilus.desktop.in.in
-===================================================================
---- nautilus.orig/data/nautilus.desktop.in.in	2013-03-12 19:34:31.066512196 +0100
-+++ nautilus/data/nautilus.desktop.in.in	2013-03-12 19:34:41.726459664 +0100
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Files
- _Comment=Access and organize files
--Exec=nautilus %U
-+Exec=nautilus --new-window %U
- Icon=system-file-manager
- Terminal=false
- Type=Application
-Index: nautilus/libnautilus-private/nautilus-file-utilities.c
-===================================================================
---- nautilus.orig/libnautilus-private/nautilus-file-utilities.c	2013-03-12 19:34:31.066512196 +0100
-+++ nautilus/libnautilus-private/nautilus-file-utilities.c	2013-03-12 19:34:31.058512174 +0100
-@@ -1296,6 +1296,48 @@
- 	return NULL;
- }
- 
-+gboolean
-+nautilus_file_selection_equal (GList *selection_a,
-+			       GList *selection_b)
-+{
-+	GList *al, *bl;
-+	gboolean selection_matches;
-+
-+	if (selection_a == NULL || selection_b == NULL) {
-+		return (selection_a == selection_b);
-+	}
-+
-+	if (g_list_length (selection_a) != g_list_length (selection_b)) {
-+		return FALSE;
-+	}
-+
-+	selection_matches = TRUE;
-+
-+	for (al = selection_a; al; al = al->next) {
-+		GFile *a_location = nautilus_file_get_location (NAUTILUS_FILE (al->data));
-+		gboolean found = FALSE;
-+
-+		for (bl = selection_b; bl; bl = bl->next) {
-+			GFile *b_location = nautilus_file_get_location (NAUTILUS_FILE (bl->data));
-+			found = g_file_equal (b_location, a_location);
-+			g_object_unref (b_location);
-+
-+			if (found) {
-+				break;
-+			}
-+		}
-+
-+		selection_matches = found;
-+		g_object_unref (a_location);
-+
-+		if (!selection_matches) {
-+			break;
-+		}
-+	}
-+
-+	return selection_matches;
-+}
-+
- #if !defined (NAUTILUS_OMIT_SELF_CHECK)
- 
- void
-Index: nautilus/libnautilus-private/nautilus-file-utilities.h
-===================================================================
---- nautilus.orig/libnautilus-private/nautilus-file-utilities.h	2013-03-12 19:34:31.066512196 +0100
-+++ nautilus/libnautilus-private/nautilus-file-utilities.h	2013-03-12 19:34:31.058512174 +0100
-@@ -95,4 +95,6 @@
- 						   GCancellable *cancellable,
- 						   gpointer user_data);
- 
-+gboolean nautilus_file_selection_equal (GList *selection_a, GList *selection_b);
-+
- #endif /* NAUTILUS_FILE_UTILITIES_H */
-Index: nautilus/src/nautilus-application.c
-===================================================================
---- nautilus.orig/src/nautilus-application.c	2013-03-12 19:34:31.066512196 +0100
-+++ nautilus/src/nautilus-application.c	2013-03-12 19:34:31.058512174 +0100
-@@ -576,6 +576,47 @@
- 	}
- }
- 
-+static NautilusWindowSlot *
-+get_window_slot_for_location (NautilusApplication *application, GFile *location)
-+{
-+	NautilusWindowSlot *slot;
-+	GList *l, *sl;
-+
-+	slot = NULL;
-+
-+	if (g_file_query_file_type (location, G_FILE_QUERY_INFO_NONE, NULL) != G_FILE_TYPE_DIRECTORY) {
-+		location = g_file_get_parent (location);
-+	} else {
-+		g_object_ref (location);
-+	}
-+
-+	for (l = gtk_application_get_windows (GTK_APPLICATION (application)); l; l = l->next) {
-+		NautilusWindow *win = NAUTILUS_WINDOW (l->data);
-+
-+		if (NAUTILUS_IS_DESKTOP_WINDOW (win))
-+			continue;
-+
-+		for (sl = nautilus_window_get_slots (win); sl; sl = sl->next) {
-+			NautilusWindowSlot *current = NAUTILUS_WINDOW_SLOT (sl->data);
-+			GFile *slot_location = nautilus_window_slot_get_location (current);
-+
-+			if (g_file_equal (slot_location, location)) {
-+				slot = current;
-+				break;
-+			}
-+		}
-+
-+		if (slot) {
-+			break;
-+		}
-+	}
-+
-+	g_object_unref (location);
-+
-+	return slot;
-+}
-+
-+
- static void
- open_window (NautilusApplication *application,
- 	     GFile *location, GdkScreen *screen, const char *geometry)
-@@ -609,6 +650,7 @@
- 
- static void
- open_windows (NautilusApplication *application,
-+	      gboolean force_new,
- 	      GFile **files,
- 	      gint n_files,
- 	      GdkScreen *screen,
-@@ -621,8 +663,22 @@
- 		open_window (application, NULL, screen, geometry);
- 	} else {
- 		/* Open windows at each requested location. */
--		for (i = 0; i < n_files; i++) {
--			open_window (application, files[i], screen, geometry);
-+		for (i = 0; i < n_files; ++i) {
-+			NautilusWindowSlot *slot = NULL;
-+
-+			if (!force_new)
-+				slot = get_window_slot_for_location (application, files[i]);
-+
-+			if (!slot) {
-+				open_window (application, files[i], screen, geometry);
-+			} else {
-+				/* We open the location again to update any possible selection */
-+				nautilus_window_slot_open_location (slot, files[i], 0);
-+
-+				NautilusWindow *window = nautilus_window_slot_get_window (slot);
-+				nautilus_window_set_active_slot (window, slot);
-+				gtk_window_present (GTK_WINDOW (window));
-+			}
- 		}
- 	}
- }
-@@ -634,19 +690,28 @@
- 				    const char *startup_id)
- {
- 	NautilusWindow *window;
-+	NautilusWindowSlot *slot;
- 	GList *sel_list = NULL;
- 
- 	nautilus_profile_start (NULL);
- 
--	window = nautilus_application_create_window (application, gdk_screen_get_default ());
--	gtk_window_set_startup_id (GTK_WINDOW (window), startup_id);
-+	slot = get_window_slot_for_location (application, location);
-+
-+	if (!slot) {
-+		window = nautilus_application_create_window (application, gdk_screen_get_default ());
-+		slot = nautilus_window_get_active_slot (window);
-+	} else {
-+		window = nautilus_window_slot_get_window (slot);
-+		nautilus_window_set_active_slot (window, slot);
-+		gtk_window_present (GTK_WINDOW (window));
-+	}
- 
- 	if (selection != NULL) {
- 		sel_list = g_list_prepend (sel_list, nautilus_file_get (selection));
- 	}
- 
--	nautilus_window_slot_open_location_full (nautilus_window_get_active_slot (window), location,
--						 0, sel_list, NULL, NULL);
-+	gtk_window_set_startup_id (GTK_WINDOW (window), startup_id);
-+	nautilus_window_slot_open_location_full (slot, location, 0, sel_list, NULL, NULL);
- 
- 	if (sel_list != NULL) {
- 		nautilus_file_list_free (sel_list);
-@@ -665,7 +730,9 @@
- 
- 	DEBUG ("Open called on the GApplication instance; %d files", n_files);
- 
--	open_windows (self, files, n_files,
-+	gboolean force_new = (g_strcmp0 (hint, "new-window") == 0);
-+
-+	open_windows (self, force_new, files, n_files,
- 		      gdk_screen_get_default (),
- 		      self->priv->geometry);
- }
-@@ -1059,6 +1126,7 @@
- 	gboolean version = FALSE;
- 	gboolean browser = FALSE;
- 	gboolean kill_shell = FALSE;
-+	gboolean open_new_window = FALSE;
- 	gboolean no_default_window = FALSE;
- 	gchar **remaining = NULL;
- 	NautilusApplication *self = NAUTILUS_APPLICATION (application);
-@@ -1075,6 +1143,8 @@
- 		  N_("Show the version of the program."), NULL },
- 		{ "geometry", 'g', 0, G_OPTION_ARG_STRING, &self->priv->geometry,
- 		  N_("Create the initial window with the given geometry."), N_("GEOMETRY") },
-+		{ "new-window", 'w', 0, G_OPTION_ARG_NONE, &open_new_window,
-+		  N_("Always open a new window for browsing specified URIs"), NULL },
- 		{ "no-default-window", 'n', 0, G_OPTION_ARG_NONE, &no_default_window,
- 		  N_("Only create windows for explicitly specified URIs."), NULL },
- 		{ "no-desktop", '\0', 0, G_OPTION_ARG_NONE, &self->priv->no_desktop,
-@@ -1089,7 +1159,6 @@
- 	GError *error = NULL;
- 	gint argc = 0;
- 	gchar **argv = NULL;
--
- 	*exit_status = EXIT_SUCCESS;
- 
- 	nautilus_profile_start (NULL);
-@@ -1127,8 +1196,8 @@
- 		goto out;
- 	}
- 
--	DEBUG ("Parsing local command line, no_default_window %d, quit %d, "
--	       "self checks %d, no_desktop %d",
-+	DEBUG ("Parsing local command line, open_new_window %d, no_default_window %d, "
-+	       "quit %d, self checks %d, no_desktop %d", open_new_window,
- 	       no_default_window, kill_shell, perform_self_check, self->priv->no_desktop);
- 
- 	g_application_register (application, NULL, &error);
-@@ -1185,7 +1254,7 @@
- 
- 	/* Invoke "Open" to create new windows */
- 	if (len > 0) {
--		g_application_open (application, files, len, "");
-+		g_application_open (application, files, len, open_new_window ? "new-window" : "");
- 	}
- 
- 	for (idx = 0; idx < len; idx++) {
-Index: nautilus/src/nautilus-window-manage-views.c
-===================================================================
---- nautilus.orig/src/nautilus-window-manage-views.c	2013-03-12 19:34:31.066512196 +0100
-+++ nautilus/src/nautilus-window-manage-views.c	2013-03-12 19:34:31.062512185 +0100
-@@ -427,6 +427,7 @@
-         NautilusWindowSlot *target_slot;
- 	NautilusWindowOpenFlags slot_flags;
- 	GFile *old_location;
-+	GList *old_selection;
- 	char *old_uri, *new_uri;
- 	int new_slot_position;
- 	gboolean use_same;
-@@ -525,9 +526,14 @@
- 		}
- 	}
- 
--        if (target_window == window && target_slot == slot &&
-+	old_selection = NULL;
-+	if (slot->content_view != NULL) {
-+		old_selection = nautilus_view_get_selection (slot->content_view);
-+	}
-+
-+	if (target_window == window && target_slot == slot && !is_desktop &&
- 	    old_location && g_file_equal (old_location, location) &&
--	    !is_desktop) {
-+	    nautilus_file_selection_equal (old_selection, new_selection)) {
- 
- 		if (callback != NULL) {
- 			callback (window, location, NULL, user_data);
-@@ -537,7 +543,7 @@
-         }
- 
- 	slot->pending_use_default_location = ((flags & NAUTILUS_WINDOW_OPEN_FLAG_USE_DEFAULT_LOCATION) != 0);
--        begin_location_change (target_slot, location, old_location, new_selection,
-+	begin_location_change (target_slot, location, old_location, new_selection,
- 			       NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
- 
-  done:
 
=== removed file 'debian/patches/git_search_dir_incremental_load.patch'
--- debian/patches/git_search_dir_incremental_load.patch	2013-03-22 17:44:56 +0000
+++ debian/patches/git_search_dir_incremental_load.patch	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-From e153ba8046f52680b98a5fc209c2b4161b193d2d Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Fri, 12 Oct 2012 23:04:14 +0000
-Subject: search-directory: enable incremental directory load
-
-Instead of emitting nautilus_directory_done_loading() from the
-"finished" callback, do it as soon as we receive the first batch of
-hits. The rest of the results will be added to the directory in
-background.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663242
----
-diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
-index 5da6f7a..510d319 100644
---- a/libnautilus-private/nautilus-search-directory.c
-+++ b/libnautilus-private/nautilus-search-directory.c
-@@ -46,7 +46,7 @@ struct NautilusSearchDirectoryDetails {
- 	NautilusSearchEngine *engine;
- 
- 	gboolean search_running;
--	gboolean search_finished;
-+	gboolean search_loaded;
- 
- 	GList *files;
- 	GHashTable *files_hash;
-@@ -90,7 +90,6 @@ G_DEFINE_TYPE (NautilusSearchDirectory, nautilus_search_directory,
- static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
- 
- static void search_engine_hits_added (NautilusSearchEngine *engine, GList *hits, NautilusSearchDirectory *search);
--static void search_engine_finished (NautilusSearchEngine *engine, NautilusSearchDirectory *search);
- static void search_engine_error (NautilusSearchEngine *engine, const char *error, NautilusSearchDirectory *search);
- static void search_callback_file_ready_callback (NautilusFile *file, gpointer data);
- static void file_changed (NautilusFile *file, NautilusSearchDirectory *search);
-@@ -161,7 +160,7 @@ start_search (NautilusSearchDirectory *search)
- 
- 	/* We need to start the search engine */
- 	search->details->search_running = TRUE;
--	search->details->search_finished = FALSE;
-+	search->details->search_loaded = FALSE;
- 
- 	set_hidden_files (search);
- 	nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (search->details->engine),
-@@ -436,7 +435,7 @@ search_call_when_ready (NautilusDirectory *directory,
- 	search_callback->wait_for_attributes = file_attributes;
- 	search_callback->wait_for_file_list = wait_for_file_list;
- 
--	if (wait_for_file_list && !search->details->search_finished) {
-+	if (wait_for_file_list && !search->details->search_loaded) {
- 		/* Add it to the pending callback list, which will be
- 		 * processed when the directory has finished loading
- 		 */
-@@ -494,6 +493,14 @@ search_cancel_callback (NautilusDirectory *directory,
- 	}
- }
- 
-+static void
-+search_callback_add_pending_file_callbacks (SearchCallback *callback)
-+{
-+	callback->file_list = nautilus_file_list_copy (callback->search_directory->details->files);
-+	callback->non_ready_hash = file_list_to_hash_table (callback->search_directory->details->files);
-+
-+	search_callback_add_file_callbacks (callback);
-+}
- 
- static void
- search_engine_hits_added (NautilusSearchEngine *engine, GList *hits, 
-@@ -542,15 +549,20 @@ search_engine_hits_added (NautilusSearchEngine *engine, GList *hits,
- 	file = nautilus_directory_get_corresponding_file (NAUTILUS_DIRECTORY (search));
- 	nautilus_file_emit_changed (file);
- 	nautilus_file_unref (file);
--}
- 
--static void
--search_callback_add_pending_file_callbacks (SearchCallback *callback)
--{
--	callback->file_list = nautilus_file_list_copy (callback->search_directory->details->files);
--	callback->non_ready_hash = file_list_to_hash_table (callback->search_directory->details->files);
-+	if (!search->details->search_loaded) {
-+		search->details->search_loaded = TRUE;
-+		nautilus_directory_emit_done_loading (NAUTILUS_DIRECTORY (search));
- 
--	search_callback_add_file_callbacks (callback);
-+		/* Add all file callbacks */
-+		g_list_foreach (search->details->pending_callback_list,
-+				(GFunc)search_callback_add_pending_file_callbacks, NULL);
-+		search->details->callback_list = g_list_concat (search->details->callback_list,
-+								search->details->pending_callback_list);
-+
-+		g_list_free (search->details->pending_callback_list);
-+		search->details->pending_callback_list = NULL;
-+	}
- }
- 
- static void
-@@ -566,23 +578,6 @@ search_engine_error (NautilusSearchEngine *engine, const char *error_message, Na
- }
- 
- static void
--search_engine_finished (NautilusSearchEngine *engine, NautilusSearchDirectory *search)
--{
--	search->details->search_finished = TRUE;
--
--	nautilus_directory_emit_done_loading (NAUTILUS_DIRECTORY (search));
--
--	/* Add all file callbacks */
--	g_list_foreach (search->details->pending_callback_list, 
--			(GFunc)search_callback_add_pending_file_callbacks, NULL);
--	search->details->callback_list = g_list_concat (search->details->callback_list,
--							search->details->pending_callback_list);
--
--	g_list_free (search->details->pending_callback_list);
--	search->details->pending_callback_list = NULL;
--}
--
--static void
- search_force_reload (NautilusDirectory *directory)
- {
- 	NautilusSearchDirectory *search;
-@@ -593,7 +588,7 @@ search_force_reload (NautilusDirectory *directory)
- 		return;
- 	}
- 	
--	search->details->search_finished = FALSE;
-+	search->details->search_loaded = FALSE;
- 
- 	/* Remove file monitors */
- 	reset_file_list (search);
-@@ -608,7 +603,7 @@ search_are_all_files_seen (NautilusDirectory *directory)
- 	search = NAUTILUS_SEARCH_DIRECTORY (directory);
- 
- 	return (!search->details->query ||
--		search->details->search_finished);
-+		search->details->search_loaded);
- }
- 
- static gboolean
-@@ -760,9 +755,6 @@ nautilus_search_directory_init (NautilusSearchDirectory *search)
- 	g_signal_connect (search->details->engine, "hits-added",
- 			  G_CALLBACK (search_engine_hits_added),
- 			  search);
--	g_signal_connect (search->details->engine, "finished",
--			  G_CALLBACK (search_engine_finished),
--			  search);
- 	g_signal_connect (search->details->engine, "error",
- 			  G_CALLBACK (search_engine_error),
- 			  search);
---
-cgit v0.9.1
 
=== removed file 'debian/patches/git_search_dont_follow_symlinks.patch'
--- debian/patches/git_search_dont_follow_symlinks.patch	2013-04-16 10:17:12 +0000
+++ debian/patches/git_search_dont_follow_symlinks.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-From 60234999479df2b890f532472ef5c9d312cfe0c9 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Thu, 04 Apr 2013 20:30:49 +0000
-Subject: search-engine-simple: don't follow symlinks when descending
-
-It's inconsistent with "find" and it can yield to unexpectedly large
-result sets.
-Do not follow symlinks when recursing the search down the hierarchy.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697181
----
-diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
-index 87ff363..9c80d2e 100644
---- a/libnautilus-private/nautilus-search-engine-simple.c
-+++ b/libnautilus-private/nautilus-search-engine-simple.c
-@@ -217,7 +217,8 @@ visit_directory (GFile *dir, SearchThreadData *data)
- 						:
- 						STD_ATTRIBUTES
- 						,
--						0, data->cancellable, NULL);
-+						G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+						data->cancellable, NULL);
- 	
- 	if (enumerator == NULL) {
- 		return;
---
 
=== removed file 'debian/patches/git_search_recursive_dir.patch'
--- debian/patches/git_search_recursive_dir.patch	2013-03-22 17:44:56 +0000
+++ debian/patches/git_search_recursive_dir.patch	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-From 6a1cdcf6a68ed4f63890bf3a3ac2a0cca121321e Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Thu, 18 Oct 2012 21:16:41 +0000
-Subject: search-directory: make the simple engine recursive
-
-https://bugzilla.gnome.org/show_bug.cgi?id=325146
----
-diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
-index 510d319..06901b6 100644
---- a/libnautilus-private/nautilus-search-directory.c
-+++ b/libnautilus-private/nautilus-search-directory.c
-@@ -145,6 +145,7 @@ static void
- start_search (NautilusSearchDirectory *search)
- {
- 	NautilusSearchEngineModel *model_provider;
-+	NautilusSearchEngineSimple *simple_provider;
- 
- 	if (!search->details->query) {
- 		return;
-@@ -169,6 +170,9 @@ start_search (NautilusSearchDirectory *search)
- 	model_provider = nautilus_search_engine_get_model_provider (search->details->engine);
- 	nautilus_search_engine_model_set_model (model_provider, search->details->base_model);
- 
-+	simple_provider = nautilus_search_engine_get_simple_provider (search->details->engine);
-+	g_object_set (simple_provider, "recursive", TRUE, NULL);
-+
- 	reset_file_list (search);
- 
- 	nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (search->details->engine));
-diff --git a/libnautilus-private/nautilus-search-engine-simple.h b/libnautilus-private/nautilus-search-engine-simple.h
-index bd11197..93f491e 100644
---- a/libnautilus-private/nautilus-search-engine-simple.h
-+++ b/libnautilus-private/nautilus-search-engine-simple.h
-@@ -24,8 +24,6 @@
- #ifndef NAUTILUS_SEARCH_ENGINE_SIMPLE_H
- #define NAUTILUS_SEARCH_ENGINE_SIMPLE_H
- 
--#include <libnautilus-private/nautilus-search-engine.h>
--
- #define NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE		(nautilus_search_engine_simple_get_type ())
- #define NAUTILUS_SEARCH_ENGINE_SIMPLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE, NautilusSearchEngineSimple))
- #define NAUTILUS_SEARCH_ENGINE_SIMPLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE, NautilusSearchEngineSimpleClass))
-diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
-index c92b745..31fa941 100644
---- a/libnautilus-private/nautilus-search-engine.c
-+++ b/libnautilus-private/nautilus-search-engine.c
-@@ -313,3 +313,9 @@ nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine)
- {
- 	return engine->details->model;
- }
-+
-+NautilusSearchEngineSimple *
-+nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine)
-+{
-+	return engine->details->simple;
-+}
-diff --git a/libnautilus-private/nautilus-search-engine.h b/libnautilus-private/nautilus-search-engine.h
-index b9cefad..916dbdd 100644
---- a/libnautilus-private/nautilus-search-engine.h
-+++ b/libnautilus-private/nautilus-search-engine.h
-@@ -28,6 +28,7 @@
- 
- #include <libnautilus-private/nautilus-directory.h>
- #include <libnautilus-private/nautilus-search-engine-model.h>
-+#include <libnautilus-private/nautilus-search-engine-simple.h>
- 
- #define NAUTILUS_TYPE_SEARCH_ENGINE		(nautilus_search_engine_get_type ())
- #define NAUTILUS_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE, NautilusSearchEngine))
-@@ -52,5 +53,7 @@ GType                 nautilus_search_engine_get_type           (void);
- NautilusSearchEngine *nautilus_search_engine_new                (void);
- NautilusSearchEngineModel *
-                       nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine);
-+NautilusSearchEngineSimple *
-+                      nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine);
- 
- #endif /* NAUTILUS_SEARCH_ENGINE_H */
---
-cgit v0.9.1
 
=== removed file 'debian/patches/git_show_accelerators.patch'
--- debian/patches/git_show_accelerators.patch	2013-03-07 00:19:06 +0000
+++ debian/patches/git_show_accelerators.patch	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-From 1c2b1e33346d2b06dedff3d81fc36e679e2d0761 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Thu, 14 Feb 2013 14:48:09 +0000
-Subject: ui: specify accelerators=true for our menu definitions
-
-This will make GtkMenuButton do the right thing and show accelerators in
-the popup.
-Thanks to Juanjo Marín for the fix.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680962
----
-diff --git a/src/nautilus-canvas-view-ui.xml b/src/nautilus-canvas-view-ui.xml
-index 5a3b313..1caffe1 100644
---- a/src/nautilus-canvas-view-ui.xml
-+++ b/src/nautilus-canvas-view-ui.xml
-@@ -1,5 +1,5 @@
- <ui>
--  <popup name="ViewMenu">
-+  <popup name="ViewMenu" accelerators="true">
-     <placeholder name="Layout Options">
-       <menuitem name="Manual Layout" action="Manual Layout"/>
-       <placeholder name="Auto Layout">
-diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
-index efdb9d1..e164fec 100644
---- a/src/nautilus-directory-view-ui.xml
-+++ b/src/nautilus-directory-view-ui.xml
-@@ -4,13 +4,13 @@
- <accelerator action="OpenCloseParent"/>
- <accelerator action="PropertiesAccel"/>
- <accelerator action="RenameSelectAll"/>
--<popup name="ViewMenu">
-+<popup name="ViewMenu" accelerators="true">
-   <placeholder name="View Details">
-     <menuitem name="Reset to Defaults" action="Reset to Defaults"/>
-     <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
-   </placeholder>
- </popup>
--<popup name="ActionMenu">
-+<popup name="ActionMenu" accelerators="true">
-   <placeholder name="New Items Placeholder">
-     <menuitem name="New Folder" action="New Folder"/>
-     <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
-diff --git a/src/nautilus-list-view-ui.xml b/src/nautilus-list-view-ui.xml
-index 22ca858..20f336d 100644
---- a/src/nautilus-list-view-ui.xml
-+++ b/src/nautilus-list-view-ui.xml
-@@ -1,5 +1,5 @@
- <ui>
--  <popup name="ViewMenu">
-+  <popup name="ViewMenu" accelerators="true">
-     <placeholder name="View Details">
-       <menuitem name="Visible Columns" action="Visible Columns"/>
-     </placeholder>
-diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
-index 2fb2961..4cb7348 100644
---- a/src/nautilus-shell-ui.xml
-+++ b/src/nautilus-shell-ui.xml
-@@ -15,7 +15,7 @@
- <accelerator action="ZoomOutAccel"/>
- <accelerator action="PromptLocationAccel"/>
- <accelerator action="ReloadAccel"/>
--<popup name="ViewMenu">
-+<popup name="ViewMenu" accelerators="true">
-   <placeholder name="Zoom Items Placeholder">
-     <menuitem name="Zoom In" action="Zoom In"/>
-     <menuitem name="Zoom Out" action="Zoom Out"/>
-@@ -33,7 +33,7 @@
-   <separator/>
-   <placeholder name="View Details"/>
- </popup>
--<popup name="ActionMenu">
-+<popup name="ActionMenu" accelerators="true">
-   <placeholder name="New Items Placeholder">
-     <menuitem name="New Tab" action="New Tab"/>
-     <menuitem name="New Window" action="New Window"/>
-
 
=== removed file 'debian/patches/git_single_filesystem_count.patch'
--- debian/patches/git_single_filesystem_count.patch	2013-01-15 03:21:01 +0000
+++ debian/patches/git_single_filesystem_count.patch	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-From a645da5f1043c59203fd194fe85b6976d75d2ece Mon Sep 17 00:00:00 2001
-From: Phillip Susi <[e-mail]>
-Date: Mon, 17 Dec 2012 14:11:54 +0000
-Subject: directory: limit deep scount (folder contents and size) to one filesystem
-
-When getting the size of the root directory, nautilus was descending
-into other filesystems including /proc, causing it to report nonsensical
-sizes.
-Store the fsid of the starting directory, and do not recurse into
-other mount points.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=629394
-https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/585472
----
-diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
-index f1d53f3..6961ae0 100644
---- a/libnautilus-private/nautilus-directory-async.c
-+++ b/libnautilus-private/nautilus-directory-async.c
-@@ -135,6 +135,7 @@ struct DeepCountState {
- 	GFile *deep_count_location;
- 	GList *deep_count_subdirectories;
- 	GArray *seen_deep_count_inodes;
-+	char *fs_id;
- };
- 
- 
-@@ -2579,6 +2580,7 @@ deep_count_one (DeepCountState *state,
- 	NautilusFile *file;
- 	GFile *subdir;
- 	gboolean is_seen_inode;
-+	const char *fs_id;
- 
- 	if (should_skip_file (NULL, info)) {
- 		return;
-@@ -2596,10 +2598,13 @@ deep_count_one (DeepCountState *state,
- 		file->details->deep_directory_count += 1;
- 
- 		/* Record the fact that we have to descend into this directory. */
--
--		subdir = g_file_get_child (state->deep_count_location, g_file_info_get_name (info));
--		state->deep_count_subdirectories = g_list_prepend
--			(state->deep_count_subdirectories, subdir);
-+		fs_id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
-+		if (g_strcmp0 (fs_id, state->fs_id) == 0) {
-+			/* only if it is on the same filesystem */
-+			subdir = g_file_get_child (state->deep_count_location, g_file_info_get_name (info));
-+			state->deep_count_subdirectories = g_list_prepend
-+				(state->deep_count_subdirectories, subdir);
-+		}
- 	} else {
- 		/* Even non-regular files count as files. */
- 		file->details->deep_file_count += 1;
-@@ -2627,6 +2632,7 @@ deep_count_state_free (DeepCountState *state)
- 	}
- 	g_list_free_full (state->deep_count_subdirectories, g_object_unref);
- 	g_array_free (state->seen_deep_count_inodes, TRUE);
-+	g_free (state->fs_id);
- 	g_free (state);
- }
- 
-@@ -2773,6 +2779,7 @@ deep_count_load (DeepCountState *state, GFile *location)
- 					 G_FILE_ATTRIBUTE_STANDARD_SIZE ","
- 					 G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
- 					 G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP ","
-+					 G_FILE_ATTRIBUTE_ID_FILESYSTEM ","
- 					 G_FILE_ATTRIBUTE_UNIX_INODE,
- 					 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, /* flags */
- 					 G_PRIORITY_LOW, /* prio */
-@@ -2804,6 +2811,25 @@ deep_count_stop (NautilusDirectory *directory)
- }
- 
- static void
-+deep_count_got_info (GObject *source_object,
-+		     GAsyncResult *res,
-+		     gpointer user_data)
-+{
-+	GFileInfo *info;
-+	const char *id;
-+	GFile *file = (GFile *)source_object;
-+	DeepCountState *state = (DeepCountState *)user_data;
-+
-+	info = g_file_query_info_finish (file, res, NULL);
-+	if (info != NULL) {
-+		id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
-+		state->fs_id = g_strdup (id);
-+		g_object_unref (info);
-+	}
-+	deep_count_load (state, file);
-+}
-+
-+static void
- deep_count_start (NautilusDirectory *directory,
- 		  NautilusFile *file,
- 		  gboolean *doing_io)
-@@ -2846,11 +2872,18 @@ deep_count_start (NautilusDirectory *directory,
- 	state->directory = directory;
- 	state->cancellable = g_cancellable_new ();
- 	state->seen_deep_count_inodes = g_array_new (FALSE, TRUE, sizeof (guint64));
-+	state->fs_id = NULL;
- 
- 	directory->details->deep_count_in_progress = state;
- 	
- 	location = nautilus_file_get_location (file);
--	deep_count_load (state, location);
-+	g_file_query_info_async (location,
-+				 G_FILE_ATTRIBUTE_ID_FILESYSTEM,
-+				 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+				 G_PRIORITY_DEFAULT,
-+				 NULL,
-+				 deep_count_got_info,
-+				 state);
- 	g_object_unref (location);
- }
- 
-
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-06-10 16:47:24 +0000
+++ debian/patches/series	2013-06-17 03:30:40 +0000
@@ -3,8 +3,6 @@
 #05_desktop_menu_export.patch
 06_never_exec_nonexec_launchers.patch
 08_clean_session_capplet.patch
-09_no-initial-fade.patch
-git_reuse_already_opened_views.patch
 11_copy_skipping_pager.patch
 12_unity_launcher_support.patch
 14_bring_del_instead_ctrl_del.patch
@@ -14,25 +12,4 @@
 18_unity_icon_color.patch
 zg_activity_logging.patch
 dont_wrap_labels_after_dots.patch
-git_add_missing_tooltips.patch
-git_launcher_no_frame.patch
-git_restore_filename.patch
-git_single_filesystem_count.patch
-git_fix_touch_double_click.patch
-git_show_accelerators.patch
-git_add_desktop_keywords.patch
-git_export_opened_locations_on_dbus.patch
-git_margin_primary_workarea_revert.patch
-10_sync_background_to_accountsservice.patch
-git_search_dir_incremental_load.patch
-git_enable_simple_search_engine.patch
-git_search_recursive_dir.patch
-git_enable_copy_from_recent.patch
-git_restore_from_missing_directories.patch
 19_unity_open_location_xid.patch
-git_reset_view_to_defaults.patch
-git_rank_exact_matches_higher.patch
-git_rank_reversed.patch
-git_search_dont_follow_symlinks.patch
-git_eel_needs_terminal.patch
-0001-trash-bar-fix-double-disconnect-handler.patch
 
=== modified file 'debian/patches/zg_activity_logging.patch'
--- debian/patches/zg_activity_logging.patch	2012-10-29 00:09:57 +0000
+++ debian/patches/zg_activity_logging.patch	2013-06-17 03:30:40 +0000
@@ -1,17 +1,17 @@
 === modified file 'nautilus-3.3.91/libnautilus-private/Makefile.am'
-Index: nautilus-3.5.5/libnautilus-private/Makefile.am
+Index: nautilus-3.8.1/libnautilus-private/Makefile.am
 ===================================================================
---- nautilus-3.5.5.orig/libnautilus-private/Makefile.am	2012-08-07 17:53:26.000000000 +0200
-+++ nautilus-3.5.5/libnautilus-private/Makefile.am	2012-08-08 09:41:30.199206870 +0200
-@@ -12,6 +12,7 @@
+--- nautilus-3.8.1.orig/libnautilus-private/Makefile.am	2013-06-04 22:27:52.532397563 -0400
++++ nautilus-3.8.1/libnautilus-private/Makefile.am	2013-06-04 22:27:52.520397564 -0400
+@@ -11,6 +11,7 @@
  	$(WARNING_CFLAGS)				\
- 	$(DISABLE_DEPRECATED_CFLAGS)			\
+ 	$(DISABLE_DEPRECATED)				\
  	$(TRACKER_CFLAGS)				\
 +	`pkg-config --cflags zeitgeist-1.0`	\
  	-DDATADIR=\""$(datadir)"\" 			\
  	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
  	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	\
-@@ -44,6 +45,7 @@
+@@ -39,6 +40,7 @@
  
  libnautilus_private_la_LDFLAGS =	\
  	-no-undefined			\
@@ -19,10 +19,10 @@
  	$(NULL)
  
  libnautilus_private_la_LIBADD =		\
-Index: nautilus-3.5.5/libnautilus-private/nautilus-file-operations.c
+Index: nautilus-3.8.1/libnautilus-private/nautilus-file-operations.c
 ===================================================================
---- nautilus-3.5.5.orig/libnautilus-private/nautilus-file-operations.c	2012-07-16 23:37:16.000000000 +0200
-+++ nautilus-3.5.5/libnautilus-private/nautilus-file-operations.c	2012-08-08 09:41:30.207206869 +0200
+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-file-operations.c	2013-06-04 22:27:52.532397563 -0400
++++ nautilus-3.8.1/libnautilus-private/nautilus-file-operations.c	2013-06-04 22:27:52.524397563 -0400
 @@ -66,6 +66,8 @@
  #include "nautilus-file-undo-operations.h"
  #include "nautilus-file-undo-manager.h"
@@ -137,7 +137,7 @@
  static void
  mark_desktop_file_trusted (CommonJob *common,
  			   GCancellable *cancellable,
-@@ -1864,6 +1964,35 @@
+@@ -1867,6 +1967,35 @@
  
  	job = user_data;
  
@@ -173,7 +173,7 @@
  	g_list_free_full (job->files, g_object_unref);
  
  	if (job->done_callback) {
-@@ -4504,6 +4633,23 @@
+@@ -4541,6 +4670,23 @@
  				    job->done_callback_data);
  	}
  
@@ -197,7 +197,7 @@
  	g_list_free_full (job->files, g_object_unref);
  	if (job->destination) {
  		g_object_unref (job->destination);
-@@ -5067,6 +5213,19 @@
+@@ -5107,6 +5253,19 @@
  				    job->done_callback_data);
  	}
  
@@ -217,7 +217,7 @@
  	g_list_free_full (job->files, g_object_unref);
  	g_object_unref (job->destination);
  	g_hash_table_unref (job->debuting_files);
-@@ -5410,6 +5569,23 @@
+@@ -5450,6 +5609,23 @@
  				    job->done_callback_data);
  	}
  
@@ -241,7 +241,7 @@
  	g_list_free_full (job->files, g_object_unref);
  	g_object_unref (job->destination);
  	g_hash_table_unref (job->debuting_files);
-@@ -5882,6 +6058,14 @@
+@@ -5922,6 +6098,14 @@
  				    job->done_callback_data);
  	}
  
@@ -256,11 +256,11 @@
  	g_object_unref (job->dest_dir);
  	if (job->src) {
  		g_object_unref (job->src);
-Index: nautilus-3.5.5/libnautilus-private/nautilus-file.c
+Index: nautilus-3.8.1/libnautilus-private/nautilus-file.c
 ===================================================================
---- nautilus-3.5.5.orig/libnautilus-private/nautilus-file.c	2012-08-08 09:41:29.955206857 +0200
-+++ nautilus-3.5.5/libnautilus-private/nautilus-file.c	2012-08-08 09:41:30.219206871 +0200
-@@ -90,6 +90,9 @@
+--- nautilus-3.8.1.orig/libnautilus-private/nautilus-file.c	2013-06-04 22:27:52.532397563 -0400
++++ nautilus-3.8.1/libnautilus-private/nautilus-file.c	2013-06-04 22:27:52.524397563 -0400
+@@ -91,6 +91,9 @@
  #define DEBUG_REF_PRINTF printf
  #endif
  
@@ -270,7 +270,7 @@
  /* Files that start with these characters sort after files that don't. */
  #define SORT_LAST_CHAR1 '.'
  #define SORT_LAST_CHAR2 '#'
-@@ -1728,10 +1731,34 @@
+@@ -1735,10 +1738,34 @@
  		old_name = g_strdup (eel_ref_str_peek (op->file->details->name));
  		
  		update_info_and_name (op->file, new_info);
@@ -306,10 +306,10 @@
  		nautilus_directory_moved (old_uri, new_uri);
  		g_free (new_uri);
  		g_free (old_uri);
-Index: nautilus-3.5.5/test/Makefile.am
+Index: nautilus-3.8.1/test/Makefile.am
 ===================================================================
---- nautilus-3.5.5.orig/test/Makefile.am	2012-05-08 06:28:09.000000000 +0200
-+++ nautilus-3.5.5/test/Makefile.am	2012-08-08 09:41:30.219206871 +0200
+--- nautilus-3.8.1.orig/test/Makefile.am	2013-06-04 22:27:52.532397563 -0400
++++ nautilus-3.8.1/test/Makefile.am	2013-06-04 22:27:52.524397563 -0400
 @@ -6,6 +6,7 @@
  	$(COMMON_CFLAGS) \
  	$(NAUTILUS_CFLAGS) \
@@ -337,10 +337,10 @@
  EXTRA_DIST = \
  	test.h \
  	$(NULL)
-Index: nautilus-3.5.5/test/run-zeitgeist-test.sh
+Index: nautilus-3.8.1/test/run-zeitgeist-test.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.5.5/test/run-zeitgeist-test.sh	2012-08-08 09:41:30.219206871 +0200
++++ nautilus-3.8.1/test/run-zeitgeist-test.sh	2013-06-04 22:27:52.524397563 -0400
 @@ -0,0 +1,50 @@
 +#! /bin/sh -e
 +
@@ -392,10 +392,10 @@
 +echo "Cleaning up..."
 +zeitgeist-daemon --quit
 +rm -r "${TMP_PATH}"
-Index: nautilus-3.5.5/test/test-nautilus-zeitgeist.c
+Index: nautilus-3.8.1/test/test-nautilus-zeitgeist.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.5.5/test/test-nautilus-zeitgeist.c	2012-08-08 09:41:30.219206871 +0200
++++ nautilus-3.8.1/test/test-nautilus-zeitgeist.c	2013-06-04 22:27:52.524397563 -0400
 @@ -0,0 +1,343 @@
 +/*
 + * Copyright © 2012 Canonical Ltd.