Merge lp:~3v1n0/nautilus/sync-unity-patches-with-3.14 into lp:~ubuntu-desktop/nautilus/ubuntu

[Marco Trevisan (Treviño)]

Sync unity patches with 3.14

[Sebastien Bacher (seb128)]

thanks!

review: Approve

=== modified file 'debian/patches/19_unity_open_location_xid.patch'
--- debian/patches/19_unity_open_location_xid.patch	2015-12-01 10:15:30 +0000
+++ debian/patches/19_unity_open_location_xid.patch	2016-02-04 02:13:28 +0000
@@ -6,10 +6,10 @@
 Forwarded: no
 Author: Marco Trevisan <[e-mail]>
 
-Index: nautilus-3.18.2/data/freedesktop-dbus-interfaces.xml
+Index: nautilus-3.14.3/data/freedesktop-dbus-interfaces.xml
 ===================================================================
---- nautilus-3.18.2.orig/data/freedesktop-dbus-interfaces.xml
-+++ nautilus-3.18.2/data/freedesktop-dbus-interfaces.xml
+--- nautilus-3.14.3.orig/data/freedesktop-dbus-interfaces.xml
++++ nautilus-3.14.3/data/freedesktop-dbus-interfaces.xml
 @@ -31,5 +31,6 @@
        <arg type='s' name='StartupId' direction='in'/>
      </method>
@@ -17,11 +17,11 @@
 +    <property name="XUbuntuOpenLocationsXids" type="a{uas}" access="read"/>
    </interface>
  </node>
-Index: nautilus-3.18.2/src/nautilus-application.c
+Index: nautilus-3.14.3/src/nautilus-application.c
 ===================================================================
---- nautilus-3.18.2.orig/src/nautilus-application.c
-+++ nautilus-3.18.2/src/nautilus-application.c
-@@ -1120,8 +1120,8 @@ nautilus_application_quit_mainloop (GApp
+--- nautilus-3.14.3.orig/src/nautilus-application.c
++++ nautilus-3.14.3/src/nautilus-application.c
+@@ -1321,8 +1321,8 @@ nautilus_application_quit_mainloop (GApp
  	G_APPLICATION_CLASS (nautilus_application_parent_class)->quit_mainloop (app);
  }
  
@@ -32,7 +32,7 @@
  {
  	gint i;
  	GList *l, *sl;
-@@ -1133,15 +1133,40 @@ update_dbus_opened_locations (NautilusAp
+@@ -1332,15 +1332,39 @@ update_dbus_opened_locations (NautilusAp
  
  	g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
  
@@ -41,51 +41,49 @@
 +
 +	g_variant_builder_init (&b, G_VARIANT_TYPE ("a{uas}"));
 +
- 	for (l = app->priv->windows; l != NULL; l = l->next) {
- 		window = l->data;
+ 	for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = l->next) {
+ 		if (!NAUTILUS_IS_WINDOW (l->data) || NAUTILUS_IS_DESKTOP_WINDOW (l->data))
+ 			continue;
  
+-		for (sl = nautilus_window_get_slots (NAUTILUS_WINDOW (l->data)); sl; sl = sl->next) {
++		NautilusWindow *window = NAUTILUS_WINDOW (l->data);
++		NautilusWindowSlot *active_slot = nautilus_window_get_active_slot (window);
++		gchar *active_uri = NULL;
++
++		if (active_slot) {
++			active_uri = nautilus_window_slot_get_location_uri (active_slot);
++		}
++
 +		g_variant_builder_init (&wb, G_VARIANT_TYPE ("as"));
-+
-+		NautilusWindowSlot *active_slot = nautilus_window_get_active_slot (window);
-+
-+		if (active_slot != NULL)
-+		{
-+			location = nautilus_window_slot_get_location (active_slot);
-+
-+			if (location != NULL) {
-+				gchar *active_uri = g_file_get_uri (location);
-+				g_variant_builder_add (&wb, "s", active_uri);
-+				g_free (active_uri);
++		g_variant_builder_add (&wb, "s", active_uri ? active_uri : "");
++		g_free (active_uri);
++
++		for (sl = nautilus_window_get_slots (window); sl; sl = sl->next) {
+ 			NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (sl->data);
++
++			if (slot == active_slot) {
++				continue;
 +			}
-+		}
 +
- 		for (sl = nautilus_window_get_slots (window); sl; sl = sl->next) {
- 			NautilusWindowSlot *slot = sl->data;
-                         location = nautilus_window_slot_get_location (slot);
+ 			gchar *uri = nautilus_window_slot_get_location_uri (slot);
  
- 			if (location != NULL) {
- 			        gchar *uri = g_file_get_uri (location);
-+
-+				if (slot != active_slot) {
-+					g_variant_builder_add (&wb, "s", uri);
-+				}
+ 			if (uri) {
++				g_variant_builder_add (&wb, "s", uri);
 +
  				GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
  
  				if (!found) {
-@@ -1152,6 +1177,21 @@ update_dbus_opened_locations (NautilusAp
+@@ -1351,6 +1375,19 @@ update_dbus_opened_locations (NautilusAp
  				}
  			}
  		}
 +
-+		if (gtk_widget_get_realized (GTK_WIDGET (l->data))) {
-+			guint32 window_id = 0;
-+			GdkWindow *gdk_win = gtk_widget_get_window (GTK_WIDGET (l->data));
++		if (gtk_widget_get_realized (GTK_WIDGET (window))) {
++			GdkWindow *gdk_win = gtk_widget_get_window (GTK_WIDGET (window));
++			guint32 window_id = GPOINTER_TO_UINT(gdk_win);
 +#ifdef GDK_WINDOWING_X11
 +			if (GDK_IS_X11_WINDOW (gdk_win)) {
 +				window_id = gdk_x11_window_get_xid (gdk_win);
-+			} else {
-+				window_id = GPOINTER_TO_UINT(gdk_win);
 +			}
 +#endif
 +			g_variant_builder_add (&b, "{uas}", window_id, &wb);
@@ -95,7 +93,7 @@
  	}
  
  	locations_array = g_new (gchar*, locations_size + 1);
-@@ -1165,6 +1205,8 @@ update_dbus_opened_locations (NautilusAp
+@@ -1364,6 +1401,8 @@ update_dbus_opened_locations (NautilusAp
  
  	nautilus_freedesktop_dbus_set_open_locations (app->priv->fdb_manager,
  		                                      (const gchar**) locations_array);
@@ -104,28 +102,23 @@
  
  	g_free (locations_array);
  	g_list_free_full (locations, g_free);
-@@ -1172,10 +1214,17 @@ update_dbus_opened_locations (NautilusAp
- 
- static void
- on_slot_location_changed (NautilusWindowSlot  *slot,
--                          GParamSpec          *pspec,
--                          NautilusApplication *application)
-+			  GParamSpec          *pspec,
-+			  NautilusApplication *application)
-+{
+@@ -1375,7 +1414,14 @@ on_slot_location_changed (NautilusWindow
+  			  const char         *to,
+ 			  NautilusApplication *application)
+ {
+-	update_dbus_opened_locations (application);
 +	nautilus_application_update_dbus_opened_locations (application);
 +}
 +
 +static void
 +on_slot_active_changed (NautilusWindowSlot *slot,
 +			NautilusApplication *application)
- {
--	update_dbus_opened_locations (application);
++{
 +	nautilus_application_update_dbus_opened_locations (application);
  }
  
  static void
-@@ -1184,10 +1233,11 @@ on_slot_added (NautilusWindow      *wind
+@@ -1384,10 +1430,11 @@ on_slot_added (NautilusWindow      *wind
  	       NautilusApplication *application)
  {
  	if (nautilus_window_slot_get_location (slot)) {
@@ -133,12 +126,12 @@
 +		nautilus_application_update_dbus_opened_locations (application);
  	}
  
- 	g_signal_connect (slot, "notify::location", G_CALLBACK (on_slot_location_changed), application);
+ 	g_signal_connect (slot, "location-changed", G_CALLBACK (on_slot_location_changed), application);
 +	g_signal_connect (slot, "active", G_CALLBACK (on_slot_active_changed), application);
  }
  
  static void
-@@ -1195,9 +1245,17 @@ on_slot_removed (NautilusWindow      *wi
+@@ -1395,9 +1442,17 @@ on_slot_removed (NautilusWindow      *wi
  		 NautilusWindowSlot  *slot,
  		 NautilusApplication *application)
  {
@@ -157,26 +150,38 @@
  }
  
  static void
-@@ -1210,6 +1268,7 @@ nautilus_application_window_added (GtkAp
+@@ -1407,8 +1462,11 @@ nautilus_application_window_added (GtkAp
+ 	/* chain to parent */
+ 	GTK_APPLICATION_CLASS (nautilus_application_parent_class)->window_added (app, window);
  
- 	if (NAUTILUS_IS_WINDOW (window)) {
- 		self->priv->windows = g_list_prepend (self->priv->windows, 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);
++	if (NAUTILUS_IS_WINDOW (window)) {
 +		g_signal_connect (window, "realize", G_CALLBACK (on_realize), app);
- 		g_signal_connect (window, "slot-added", G_CALLBACK (on_slot_added), app);
- 		g_signal_connect (window, "slot-removed", G_CALLBACK (on_slot_removed), app);
++		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
+@@ -1426,8 +1484,11 @@ nautilus_application_window_removed (Gtk
+ 		nautilus_previewer_call_close ();
  	}
-@@ -1225,6 +1284,7 @@ nautilus_application_window_removed (Gtk
  
- 	if (NAUTILUS_IS_WINDOW (window)) {
- 		self->priv->windows = g_list_remove_all (self->priv->windows, window);
+-	g_signal_handlers_disconnect_by_func (window, on_slot_added, app);
+-	g_signal_handlers_disconnect_by_func (window, on_slot_removed, app);
++	if (NAUTILUS_IS_WINDOW (window)) {
 +		g_signal_handlers_disconnect_by_func (window, on_realize, app);
- 		g_signal_handlers_disconnect_by_func (window, on_slot_added, app);
- 		g_signal_handlers_disconnect_by_func (window, on_slot_removed, app);
- 	}
-Index: nautilus-3.18.2/src/nautilus-freedesktop-dbus.c
++		g_signal_handlers_disconnect_by_func (window, on_slot_added, app);
++		g_signal_handlers_disconnect_by_func (window, on_slot_removed, app);
++	}
+ }
+ 
+ static void
+Index: nautilus-3.14.3/src/nautilus-freedesktop-dbus.c
 ===================================================================
---- nautilus-3.18.2.orig/src/nautilus-freedesktop-dbus.c
-+++ nautilus-3.18.2/src/nautilus-freedesktop-dbus.c
+--- nautilus-3.14.3.orig/src/nautilus-freedesktop-dbus.c
++++ nautilus-3.14.3/src/nautilus-freedesktop-dbus.c
 @@ -152,6 +152,9 @@ bus_acquired_cb (GDBusConnection *conn,
  			  G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb);
  
@@ -207,10 +212,10 @@
  }
  
  /* Tries to own the org.freedesktop.FileManager1 service name */
-Index: nautilus-3.18.2/src/nautilus-freedesktop-dbus.h
+Index: nautilus-3.14.3/src/nautilus-freedesktop-dbus.h
 ===================================================================
---- nautilus-3.18.2.orig/src/nautilus-freedesktop-dbus.h
-+++ nautilus-3.18.2/src/nautilus-freedesktop-dbus.h
+--- nautilus-3.14.3.orig/src/nautilus-freedesktop-dbus.h
++++ nautilus-3.14.3/src/nautilus-freedesktop-dbus.h
 @@ -47,5 +47,6 @@ GType nautilus_freedesktop_dbus_get_type
  NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);
  
@@ -218,14 +223,14 @@
 +void nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb, GVariant *locations);
  
  #endif /* __NAUTILUS_FREEDESKTOP_DBUS_H__ */
-Index: nautilus-3.18.2/src/nautilus-application.h
+Index: nautilus-3.14.3/src/nautilus-application.h
 ===================================================================
---- nautilus-3.18.2.orig/src/nautilus-application.h
-+++ nautilus-3.18.2/src/nautilus-application.h
-@@ -85,4 +85,6 @@ void nautilus_application_edit_bookmarks
- 
+--- nautilus-3.14.3.orig/src/nautilus-application.h
++++ nautilus-3.14.3/src/nautilus-application.h
+@@ -81,4 +81,6 @@ void nautilus_application_edit_bookmarks
  GtkWidget * nautilus_application_connect_server (NautilusApplication *application,
  						 NautilusWindow      *window);
-+
+ 
 +void nautilus_application_update_dbus_opened_locations (NautilusApplication *app);
++
  #endif /* __NAUTILUS_APPLICATION_H__ */

=== modified file 'debian/patches/20_add_timestamp_to_operations.patch'
--- debian/patches/20_add_timestamp_to_operations.patch	2015-12-01 09:57:33 +0000
+++ debian/patches/20_add_timestamp_to_operations.patch	2016-02-04 02:13:28 +0000
@@ -6,10 +6,10 @@
 Forwarded: yes
 Author: Marco Trevisan <[e-mail]>
 
-Index: nautilus-3.18.2/data/dbus-interfaces.xml
+Index: nautilus-3.14.3/data/dbus-interfaces.xml
 ===================================================================
---- nautilus-3.18.2.orig/data/dbus-interfaces.xml
-+++ nautilus-3.18.2/data/dbus-interfaces.xml
+--- nautilus-3.14.3.orig/data/dbus-interfaces.xml
++++ nautilus-3.14.3/data/dbus-interfaces.xml
 @@ -27,13 +27,28 @@
        <arg type='as' name='SourceFilesURIList' direction='in'/>
        <arg type='s' name='DestinationDirectoryURI' direction='in'/>
@@ -39,11 +39,11 @@
 +    </method>
    </interface>
  </node>
-Index: nautilus-3.18.2/libnautilus-private/nautilus-file-operations.c
+Index: nautilus-3.14.3/libnautilus-private/nautilus-file-operations.c
 ===================================================================
---- nautilus-3.18.2.orig/libnautilus-private/nautilus-file-operations.c
-+++ nautilus-3.18.2/libnautilus-private/nautilus-file-operations.c
-@@ -72,6 +72,7 @@ typedef struct {
+--- nautilus-3.14.3.orig/libnautilus-private/nautilus-file-operations.c
++++ nautilus-3.14.3/libnautilus-private/nautilus-file-operations.c
+@@ -74,6 +74,7 @@ typedef struct {
  	GtkWindow *parent_window;
  	int screen_num;
  	guint inhibit_cookie;
@@ -51,7 +51,7 @@
  	NautilusProgressInfo *progress;
  	GCancellable *cancellable;
  	GHashTable *skip_files;
-@@ -1061,7 +1062,8 @@ typedef struct {
+@@ -1164,7 +1165,8 @@ typedef struct {
  	const char *details_text;
  	const char **button_titles;
  	gboolean show_all;
@@ -61,7 +61,7 @@
  	int result;
  } RunSimpleDialogData;
  
-@@ -1104,7 +1106,8 @@ do_run_simple_dialog (gpointer _data)
+@@ -1207,7 +1209,8 @@ do_run_simple_dialog (gpointer _data)
  	}
  	
  	/* Run it. */
@@ -71,7 +71,7 @@
  	
  	while ((result == GTK_RESPONSE_NONE || result == GTK_RESPONSE_DELETE_EVENT) && data->ignore_close_box) {
  		result = gtk_dialog_run (GTK_DIALOG (dialog));
-@@ -1145,6 +1148,7 @@ run_simple_dialog_va (CommonJob *job,
+@@ -1248,6 +1251,7 @@ run_simple_dialog_va (CommonJob *job,
  	data->secondary_text = secondary_text;
  	data->details_text = details_text;
  	data->show_all = show_all;
@@ -79,7 +79,7 @@
  
  	ptr_array = g_ptr_array_new ();
  	while ((button_title = va_arg (varargs, const char *)) != NULL) {
-@@ -5065,6 +5069,26 @@ nautilus_file_operations_copy_file (GFil
+@@ -4819,6 +4823,26 @@ nautilus_file_operations_copy_file (GFil
  				    NautilusCopyCallback done_callback,
  				    gpointer done_callback_data)
  {
@@ -106,15 +106,15 @@
  	CopyMoveJob *job;
  
  	job = op_job_new (CopyMoveJob, parent_window);
-@@ -5077,6 +5101,7 @@ nautilus_file_operations_copy_file (GFil
-         nautilus_progress_info_set_destination (((CommonJob *)job)->progress, target_dir);
+@@ -4828,6 +4852,7 @@ nautilus_file_operations_copy_file (GFil
+ 	job->destination = g_object_ref (target_dir);
  	job->target_name = g_strdup (new_name);
  	job->debuting_files = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, g_object_unref, NULL);
 +	((CommonJob *)job)->action_timestamp = timestamp;
  
  	if (source_display_name != NULL) {
  		gchar *path;
-@@ -5104,6 +5129,24 @@ nautilus_file_operations_copy (GList *fi
+@@ -4855,6 +4880,24 @@ nautilus_file_operations_copy (GList *fi
  			       NautilusCopyCallback  done_callback,
  			       gpointer done_callback_data)
  {
@@ -139,15 +139,15 @@
  	CopyMoveJob *job;
  
  	job = op_job_new (CopyMoveJob, parent_window);
-@@ -5112,6 +5155,7 @@ nautilus_file_operations_copy (GList *fi
+@@ -4863,6 +4906,7 @@ nautilus_file_operations_copy (GList *fi
  	job->done_callback_data = done_callback_data;
  	job->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL);
  	job->destination = g_object_ref (target_dir);
 +	((CommonJob *)job)->action_timestamp = timestamp;
-         /* Need to indicate the destination for the operation notification open
-          * button. */
-         nautilus_progress_info_set_destination (((CommonJob *)job)->progress, target_dir);
-@@ -6933,6 +6977,13 @@ empty_trash_job (GIOSchedulerJob *io_job
+ 	if (relative_item_points != NULL &&
+ 	    relative_item_points->len > 0) {
+ 		job->icon_positions =
+@@ -6664,6 +6708,13 @@ empty_trash_job (GIOSchedulerJob *io_job
  void 
  nautilus_file_operations_empty_trash (GtkWidget *parent_view)
  {
@@ -161,7 +161,7 @@
  	EmptyTrashJob *job;
  	GtkWindow *parent_window;
  
-@@ -6945,6 +6996,7 @@ nautilus_file_operations_empty_trash (Gt
+@@ -6676,6 +6727,7 @@ nautilus_file_operations_empty_trash (Gt
  	job->trash_dirs = g_list_prepend (job->trash_dirs,
  					  g_file_new_for_uri ("trash:"));
  	job->should_confirm = TRUE;
@@ -169,11 +169,11 @@
  
  	inhibit_power_manager ((CommonJob *)job, _("Emptying Trash"));
  	
-Index: nautilus-3.18.2/libnautilus-private/nautilus-file-operations.h
+Index: nautilus-3.14.3/libnautilus-private/nautilus-file-operations.h
 ===================================================================
---- nautilus-3.18.2.orig/libnautilus-private/nautilus-file-operations.h
-+++ nautilus-3.18.2/libnautilus-private/nautilus-file-operations.h
-@@ -62,7 +62,17 @@ void nautilus_file_operations_copy_file
+--- nautilus-3.14.3.orig/libnautilus-private/nautilus-file-operations.h
++++ nautilus-3.14.3/libnautilus-private/nautilus-file-operations.h
+@@ -60,7 +60,17 @@ void nautilus_file_operations_copy_file
  					 GtkWindow *parent_window,
  					 NautilusCopyCallback done_callback,
  					 gpointer done_callback_data);
@@ -191,7 +191,7 @@
  void nautilus_file_operations_new_folder  (GtkWidget                 *parent_view,
  					   GdkPoint                  *target_point,
  					   const char                *parent_dir_uri,
-@@ -126,6 +136,13 @@ void nautilus_file_operations_copy
+@@ -123,6 +133,13 @@ void nautilus_file_operations_copy
  					 GtkWindow            *parent_window,
  					 NautilusCopyCallback  done_callback,
  					 gpointer              done_callback_data);
@@ -205,10 +205,10 @@
  void nautilus_file_operations_move      (GList                *files,
  					 GArray               *relative_item_points,
  					 GFile                *target_dir,
-Index: nautilus-3.18.2/src/nautilus-dbus-manager.c
+Index: nautilus-3.14.3/src/nautilus-dbus-manager.c
 ===================================================================
---- nautilus-3.18.2.orig/src/nautilus-dbus-manager.c
-+++ nautilus-3.18.2/src/nautilus-dbus-manager.c
+--- nautilus-3.14.3.orig/src/nautilus-dbus-manager.c
++++ nautilus-3.14.3/src/nautilus-dbus-manager.c
 @@ -57,13 +57,12 @@ nautilus_dbus_manager_dispose (GObject *
    G_OBJECT_CLASS (nautilus_dbus_manager_parent_class)->dispose (object);
  }