Merge lp:~3v1n0/nautilus/reuse-already-opened-views into lp:~ubuntu-desktop/nautilus/ubuntu

[Marco Trevisan (Treviño)]

* debian/patches/10_reuse_already_opened_views.patch
  - Try to reuse the available windows or tabs when opening an already opened
    location (lp: #692444)
* debian/patches/12_unity_launcher_support.patch:
  - Use the quicklist activation timestamp to set the application user time
      so that the opened windows will be focused (lp: #1154237)
* debian/patches/17_static_unity_quicklist.patch:
  - Use nautilus --new-window to open a New window

- Backported the upstream patches I wrote to fix bug https://bugzilla.gnome.org/show_bug.cgi?id=694034
- Updated the unity launcher support patch to use g_application_open to use the same codepath
- Updated the Exec and the static quicklist to use the --new-window flag

[lp:~3v1n0/nautilus/reuse-already-opened-views]

363. By Marco Trevisan (Treviño) on 2013-03-12

* debian/patches/19_add_desktop_keywords.patch:
  - Adding .desktop files keywords from upstream

364. By Marco Trevisan (Treviño) on 2013-03-13

debian/changelog: added missing entry

365. By Marco Trevisan (Treviño) on 2013-03-13

debian/patches/10_reuse_already_opened_views.patch: added DEP-3 headers

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-08 15:56:13 +0000
+++ debian/changelog	2013-03-12 18:30:31 +0000
@@ -1,3 +1,18 @@
+nautilus (1:3.6.3-0ubuntu9) UNRELEASED; urgency=low
+
+  * debian/patches/10_reuse_already_opened_views.patch
+    - Try to reuse the available windows or tabs when opening an already opened
+      location (lp: #692444)
+  * debian/patches/12_unity_launcher_support.patch:
+    - Quicklist entries to show the copy dialog should use a separator (lp: #1154109)
+    - Transfer dialog should be presented using the correct timestamp (lp: #1154111)
+    - Use the quicklist activation timestamp to set the application user time
+      so that the opened windows will be focused (lp: #1154237)
+  * debian/patches/17_static_unity_quicklist.patch:
+    - Use nautilus --new-window to open a New window
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 12 Mar 2013 18:57:21 +0100
+
 nautilus (1:3.6.3-0ubuntu8) raring; urgency=low
 
   * debian/control.in:
 
=== added file 'debian/patches/10_reuse_already_opened_views.patch'
--- debian/patches/10_reuse_already_opened_views.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/10_reuse_already_opened_views.patch	2013-03-12 18:30:31 +0000
@@ -0,0 +1,290 @@
+Index: nautilus/data/nautilus.desktop.in.in
+===================================================================
+--- nautilus.orig/data/nautilus.desktop.in.in	2013-03-12 16:26:12.000000000 +0100
++++ nautilus/data/nautilus.desktop.in.in	2013-03-12 16:27:57.254745628 +0100
+@@ -1,7 +1,8 @@
+ [Desktop Entry]
+ _Name=Files
+ _Comment=Access and organize files
+-Exec=nautilus %U
++_Keywords=folder;manager;explore;disk;filesystem;
++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 16:26:03.146976000 +0100
++++ nautilus/libnautilus-private/nautilus-file-utilities.c	2013-03-12 16:39:11.822510184 +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 16:26:03.146976000 +0100
++++ nautilus/libnautilus-private/nautilus-file-utilities.h	2013-03-12 16:39:11.822510184 +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 16:26:13.000000000 +0100
++++ nautilus/src/nautilus-application.c	2013-03-12 16:28:01.818743973 +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 13:22:34.506542000 +0100
++++ nautilus/src/nautilus-window-manage-views.c	2013-03-12 16:38:09.442531224 +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:
 
=== modified file 'debian/patches/12_unity_launcher_support.patch'
--- debian/patches/12_unity_launcher_support.patch	2012-10-31 07:02:17 +0000
+++ debian/patches/12_unity_launcher_support.patch	2013-03-12 18:30:31 +0000
@@ -1,8 +1,8 @@
 === modified file 'configure.in'
-Index: nautilus-3.6.2/configure.in
+Index: nautilus/configure.in
 ===================================================================
---- nautilus-3.6.2.orig/configure.in	2012-10-31 02:33:43.228876867 -0400
-+++ nautilus-3.6.2/configure.in	2012-10-31 02:34:01.976876084 -0400
+--- 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)
  m4_define(exempi_minver,               2.1.0)
@@ -50,10 +50,10 @@
  	nautilus-sendto ext:	$enable_nst_extension
  	Tracker support:	$enable_tracker
  
-Index: nautilus-3.6.2/libnautilus-private/nautilus-progress-info.c
+Index: nautilus/libnautilus-private/nautilus-progress-info.c
 ===================================================================
---- nautilus-3.6.2.orig/libnautilus-private/nautilus-progress-info.c	2012-10-31 02:33:43.228876867 -0400
-+++ nautilus-3.6.2/libnautilus-private/nautilus-progress-info.c	2012-10-31 02:34:01.976876084 -0400
+--- 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
 @@ -52,6 +52,8 @@
  	char *status;
  	char *details;
@@ -115,10 +115,10 @@
  		info->progress_at_idle = TRUE;
  		queue_idle (info, FALSE);
  	}
-Index: nautilus-3.6.2/libnautilus-private/nautilus-progress-info.h
+Index: nautilus/libnautilus-private/nautilus-progress-info.h
 ===================================================================
---- nautilus-3.6.2.orig/libnautilus-private/nautilus-progress-info.h	2012-10-31 02:33:43.228876867 -0400
-+++ nautilus-3.6.2/libnautilus-private/nautilus-progress-info.h	2012-10-31 02:34:01.980876084 -0400
+--- 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
 @@ -62,6 +62,8 @@
  gboolean      nautilus_progress_info_get_is_started  (NautilusProgressInfo *info);
  gboolean      nautilus_progress_info_get_is_finished (NautilusProgressInfo *info);
@@ -128,10 +128,10 @@
  
  void          nautilus_progress_info_start           (NautilusProgressInfo *info);
  void          nautilus_progress_info_finish          (NautilusProgressInfo *info);
-Index: nautilus-3.6.2/src/Makefile.am
+Index: nautilus/src/Makefile.am
 ===================================================================
---- nautilus-3.6.2.orig/src/Makefile.am	2012-10-31 02:33:43.228876867 -0400
-+++ nautilus-3.6.2/src/Makefile.am	2012-10-31 02:34:01.980876084 -0400
+--- 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 @@
  	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
  	-DVERSION="\"$(VERSION)\"" 				\
@@ -159,10 +159,10 @@
  	$(NULL)
  
  nodist_nautilus_SOURCES = \
-Index: nautilus-3.6.2/src/nautilus-progress-ui-handler.c
+Index: nautilus/src/nautilus-progress-ui-handler.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-progress-ui-handler.c	2012-10-31 02:33:43.228876867 -0400
-+++ nautilus-3.6.2/src/nautilus-progress-ui-handler.c	2012-10-31 02:34:01.980876084 -0400
+--- 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
 @@ -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,208 @@
+@@ -181,6 +189,221 @@
  	gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
  }
  
@@ -246,12 +246,7 @@
 +{
 +	g_return_if_fail (self);
 +
-+	if (!gtk_widget_get_visible (self->priv->progress_window)) {
-+		gtk_window_present (GTK_WINDOW (self->priv->progress_window));
-+	} else {
-+		gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), TRUE);
-+		gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), FALSE);
-+	}
++	gtk_window_present_with_time (GTK_WINDOW (self->priv->progress_window), timestamp);
 +}
 +
 +static void
@@ -279,28 +274,46 @@
 +
 +	for (l = unity_quicklist_get_launcher_entries (self->priv->unity_quicklist_handler); l; l = l->next) {
 +		UnityLauncherEntry *entry = l->data;
-+
-+		DbusmenuMenuitem *quickmenu = dbusmenu_menuitem_new ();
++		DbusmenuMenuitem *ql = unity_launcher_entry_get_quicklist (entry);
++		DbusmenuMenuitem *quickmenu;
++
++		if (ql) {
++			quickmenu = dbusmenu_menuitem_new ();
++			dbusmenu_menuitem_property_set (quickmenu,
++			                                DBUSMENU_MENUITEM_PROP_TYPE,
++			                                DBUSMENU_CLIENT_TYPES_SEPARATOR);
++			dbusmenu_menuitem_property_set_bool (quickmenu,
++			                                     DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
++			dbusmenu_menuitem_property_set_bool (quickmenu,
++			                                     UNITY_QUICKLIST_PROGRESS_ITEM, TRUE);
++			unity_quicklist_handler_append_menuitem (entry, quickmenu);
++		}
++
++		quickmenu = dbusmenu_menuitem_new ();
 +		dbusmenu_menuitem_property_set (quickmenu,
 +		                                DBUSMENU_MENUITEM_PROP_LABEL,
-+			                            UNITY_QUICKLIST_SHOW_COPY_DIALOG);
++		                                UNITY_QUICKLIST_SHOW_COPY_DIALOG);
 +		dbusmenu_menuitem_property_set_bool (quickmenu,
 +		                                     DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
++		dbusmenu_menuitem_property_set_bool (quickmenu,
++		                                     UNITY_QUICKLIST_PROGRESS_ITEM, TRUE);
 +		unity_quicklist_handler_append_menuitem (entry, quickmenu);
 +		g_signal_connect (quickmenu, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
 +		                  (GCallback) progress_ui_handler_unity_quicklist_show_activated,
-+			              self);
++		                  self);
 +
 +		quickmenu = dbusmenu_menuitem_new ();
 +		dbusmenu_menuitem_property_set (quickmenu,
-+			                            DBUSMENU_MENUITEM_PROP_LABEL,
-+				                        UNITY_QUICKLIST_CANCEL_COPY);
++		                                DBUSMENU_MENUITEM_PROP_LABEL,
++		                                UNITY_QUICKLIST_CANCEL_COPY);
 +		dbusmenu_menuitem_property_set_bool (quickmenu,
 +		                                     DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
++		dbusmenu_menuitem_property_set_bool (quickmenu,
++		                                     UNITY_QUICKLIST_PROGRESS_ITEM, TRUE);
 +		unity_quicklist_handler_append_menuitem (entry, quickmenu);
 +		g_signal_connect (quickmenu, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
 +		                  (GCallback) progress_ui_handler_unity_quicklist_cancel_activated,
-+			              self);
++		                  self);
 +	}
 +}
 +
@@ -394,7 +407,7 @@
  static gboolean
  progress_window_delete_event (GtkWidget *widget,
  			      GdkEvent *event,
-@@ -313,6 +523,10 @@
+@@ -313,6 +536,10 @@
  			progress_ui_handler_show_complete_notification (self);
  		}
  	}
@@ -405,7 +418,7 @@
  }
  
  static void
-@@ -335,6 +549,10 @@
+@@ -335,6 +562,10 @@
  			progress_ui_handler_update_notification_or_status (self);
  		}
  	}
@@ -416,11 +429,11 @@
  }
  
  typedef struct {
-Index: nautilus-3.6.2/src/unity-quicklist-handler.c
+Index: nautilus/src/unity-quicklist-handler.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.6.2/src/unity-quicklist-handler.c	2012-10-31 02:34:01.980876084 -0400
-@@ -0,0 +1,156 @@
++++ nautilus/src/unity-quicklist-handler.c	2013-03-12 17:57:43.413743092 +0100
+@@ -0,0 +1,153 @@
 +/*unity-quicklist-handler.c: handle Unity quicklists
 + *
 + * Copyright (C) 2012 Canonical
@@ -466,10 +479,7 @@
 +unity_quicklist_handler_menuitem_is_progress_item (DbusmenuMenuitem *ql)
 +{
 +	g_return_val_if_fail(ql, FALSE);
-+	const gchar *label = dbusmenu_menuitem_property_get (ql, DBUSMENU_MENUITEM_PROP_LABEL);
-+
-+	return ((g_strcmp0 (label, (const gchar*)UNITY_QUICKLIST_SHOW_COPY_DIALOG) == 0) ||
-+	        (g_strcmp0 (label, (const gchar*)UNITY_QUICKLIST_CANCEL_COPY) == 0));
++	return dbusmenu_menuitem_property_get_bool (ql, UNITY_QUICKLIST_PROGRESS_ITEM);
 +}
 +
 +gboolean
@@ -577,11 +587,11 @@
 +	return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL);
 +}
 +
-Index: nautilus-3.6.2/src/unity-quicklist-handler.h
+Index: nautilus/src/unity-quicklist-handler.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.6.2/src/unity-quicklist-handler.h	2012-10-31 02:34:01.980876084 -0400
-@@ -0,0 +1,73 @@
++++ nautilus/src/unity-quicklist-handler.h	2013-03-12 17:57:43.413743092 +0100
+@@ -0,0 +1,75 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/*
 + * unity-quicklist.h: handle unity quicklists.
@@ -630,6 +640,8 @@
 +
 +typedef struct _UnityQuicklistHandlerPriv UnityQuicklistHandlerPriv;
 +
++#define UNITY_QUICKLIST_PROGRESS_ITEM "unity-quicklist-progress-item"
++
 +typedef struct {
 +  GObject parent;
 +
@@ -655,10 +667,10 @@
 +#define UNITY_QUICKLIST_CANCEL_COPY _("Cancel All In-progress Actions")
 +
 +#endif /* __UNITY_QUICKLIST_HANDLER_H__ */
-Index: nautilus-3.6.2/src/nautilus-application.c
+Index: nautilus/src/nautilus-application.c
 ===================================================================
---- nautilus-3.6.2.orig/src/nautilus-application.c	2012-10-31 02:33:43.228876867 -0400
-+++ nautilus-3.6.2/src/nautilus-application.c	2012-10-31 02:34:01.980876084 -0400
+--- 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
 @@ -79,6 +79,10 @@
  #include <gdk/gdkx.h>
  #include <gtk/gtk.h>
@@ -670,7 +682,7 @@
  /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
  #define APPLICATION_WINDOW_MIN_WIDTH	300
  #define APPLICATION_WINDOW_MIN_HEIGHT	100
-@@ -1479,6 +1483,10 @@
+@@ -1548,6 +1552,10 @@
  	nautilus_application_init_actions (self);
  
  	nautilus_profile_end (NULL);
@@ -681,11 +693,11 @@
  }
  
  static void
-Index: nautilus-3.6.2/src/unity-bookmarks-handler.c
+Index: nautilus/src/unity-bookmarks-handler.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.6.2/src/unity-bookmarks-handler.c	2012-10-31 02:34:01.980876084 -0400
-@@ -0,0 +1,137 @@
++++ nautilus/src/unity-bookmarks-handler.c	2013-03-12 18:57:09.410958729 +0100
+@@ -0,0 +1,144 @@
 +/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist
 + *
 + * Copyright (C) 2012 Canonical
@@ -729,19 +741,26 @@
 +								guint timestamp,
 +								NautilusBookmark *bookmark)
 +{
-+	g_assert (NAUTILUS_IS_BOOKMARK (bookmark));
++	g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark));
 +
-+	GFile *location;
++	GFile *locations[2];
++	GList *windows, *l;
 +	NautilusApplication *application;
-+	NautilusWindow *new_window;
 +
-+	location = nautilus_bookmark_get_location (bookmark);
++	locations[0] = nautilus_bookmark_get_location (bookmark);
++	locations[1] = NULL;
 +
 +	application = NAUTILUS_APPLICATION (g_application_get_default ());
-+	new_window = nautilus_application_create_window (application, gdk_screen_get_default ());
-+	nautilus_window_slot_open_location (nautilus_window_get_active_slot (new_window), location, 0);
-+
-+	g_object_unref (location);
++
++	/* Make sure that the application timestamp matches the event */
++	for (l = gtk_application_get_windows (GTK_APPLICATION (application)); l; l = l->next) {
++		GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (l->data));
++		gdk_x11_window_set_user_time (gdk_window, timestamp);
++	}
++
++	g_application_open (G_APPLICATION (application), locations, 1, "");
++
++	g_object_unref (locations[0]);
 +}
 +
 +static void
@@ -823,10 +842,10 @@
 +						G_CALLBACK (unity_bookmarks_handler_refresh_bookmarks), 0);
 +}
 +
-Index: nautilus-3.6.2/src/unity-bookmarks-handler.h
+Index: nautilus/src/unity-bookmarks-handler.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ nautilus-3.6.2/src/unity-bookmarks-handler.h	2012-10-31 02:34:01.980876084 -0400
++++ nautilus/src/unity-bookmarks-handler.h	2013-03-12 17:57:43.417743091 +0100
 @@ -0,0 +1,31 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/*
@@ -859,10 +878,10 @@
 +void unity_bookmarks_handler_initialize (void);
 +
 +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/
-Index: nautilus-3.6.2/po/POTFILES.in
+Index: nautilus/po/POTFILES.in
 ===================================================================
---- nautilus-3.6.2.orig/po/POTFILES.in	2012-10-31 02:33:43.228876867 -0400
-+++ nautilus-3.6.2/po/POTFILES.in	2012-10-31 02:34:01.980876084 -0400
+--- 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
 @@ -90,3 +90,4 @@
  src/nautilus-window-private.h
  src/nautilus-window-slot.c
 
=== modified file 'debian/patches/17_static_unity_quicklist.patch'
--- debian/patches/17_static_unity_quicklist.patch	2013-03-08 13:44:44 +0000
+++ debian/patches/17_static_unity_quicklist.patch	2013-03-12 18:30:31 +0000
@@ -1,8 +1,8 @@
-Index: nautilus-3.5.5/data/nautilus.desktop.in.in
+Index: nautilus/data/nautilus.desktop.in.in
 ===================================================================
---- nautilus-3.5.5.orig/data/nautilus.desktop.in.in	2012-05-08 06:28:08.000000000 +0200
-+++ nautilus-3.5.5/data/nautilus.desktop.in.in	2012-08-08 09:41:30.183206868 +0200
-@@ -13,3 +13,9 @@
+--- 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
+@@ -14,3 +14,9 @@
  X-GNOME-Bugzilla-Product=nautilus
  X-GNOME-Bugzilla-Component=general
  X-GNOME-Bugzilla-Version=@VERSION@
@@ -10,5 +10,5 @@
 +
 +[Desktop Action Window]
 +_Name=Open a New Window
-+Exec=nautilus
++Exec=nautilus --new-window
 +OnlyShowIn=Unity;
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-08 13:44:44 +0000
+++ debian/patches/series	2013-03-12 18:30:31 +0000
@@ -4,6 +4,7 @@
 06_never_exec_nonexec_launchers.patch
 08_clean_session_capplet.patch
 09_no-initial-fade.patch
+10_reuse_already_opened_views.patch
 11_copy_skipping_pager.patch
 12_unity_launcher_support.patch
 14_bring_del_instead_ctrl_del.patch