Merge lp:~3v1n0/nautilus/export-active-locations into lp:~ubuntu-desktop/nautilus/ubuntu

[Marco Trevisan (Treviño)]

debian/patches/19_unity_open_location_xid.patch: ensure that the active location is always the first listed

debian/patches/19_unity_open_location_xid.patch: ensure that the active location is always the first listed

[Sebastien Bacher (seb128)]

Looks fine, thanks

review: Approve

[lp:~3v1n0/nautilus/export-active-locations]

479. By Marco Trevisan (Treviño) on 2015-11-26

19_unity_open_location_xid.patch: only use window xid on X11

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-09 17:33:59 +0000
+++ debian/changelog	2015-11-26 17:05:10 +0000
@@ -1,5 +1,6 @@
 nautilus (1:3.18.1-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Sebastien Bacher ]
   * Work in progress, those patches still need to be updated/dropped before
     uploading to xenial
     - the menubar patch needs to be rewritten
@@ -101,6 +102,10 @@
     length allowed, and this tripped us up and crashed nautilus. (LP:
     #1280867)
 
+  [ Marco Trevisan (Treviño) ]
+  * debian/patches/19_unity_open_location_xid.patch: 
+    ensure that the active location is always the first listed
+
  -- Sebastien Bacher <[e-mail]>  Mon, 09 Nov 2015 16:09:54 +0100
 
 nautilus (3.18.1-1) unstable; urgency=medium

=== modified file 'debian/patches/19_unity_open_location_xid.patch'
--- debian/patches/19_unity_open_location_xid.patch	2015-11-09 17:33:59 +0000
+++ debian/patches/19_unity_open_location_xid.patch	2015-11-26 17:05:10 +0000
@@ -32,7 +32,7 @@
  {
  	gint i;
  	GList *l, *sl;
-@@ -1113,15 +1113,24 @@ update_dbus_opened_locations (NautilusAp
+@@ -1113,15 +1113,36 @@ update_dbus_opened_locations (NautilusAp
  
  	g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
  
@@ -46,18 +46,30 @@
  
 +		g_variant_builder_init (&wb, G_VARIANT_TYPE ("as"));
 +
++		NautilusWindowSlot *active_slot = nautilus_window_get_active_slot (window);
++		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);
++		}
++
  		for (sl = nautilus_window_get_slots (window); sl; sl = sl->next) {
  			NautilusWindowSlot *slot = sl->data;
                          location = nautilus_window_slot_get_location (slot);
  
  			if (location != NULL) {
  			        gchar *uri = g_file_get_uri (location);
-+				g_variant_builder_add (&wb, "s", uri);
++
++				if (slot != active_slot) {
++					g_variant_builder_add (&wb, "s", uri);
++				}
 +
  				GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
  
  				if (!found) {
-@@ -1132,6 +1141,17 @@ update_dbus_opened_locations (NautilusAp
+@@ -1132,6 +1153,17 @@ update_dbus_opened_locations (NautilusAp
  				}
  			}
  		}
@@ -75,7 +87,7 @@
  	}
  
  	locations_array = g_new (gchar*, locations_size + 1);
-@@ -1145,6 +1165,8 @@ update_dbus_opened_locations (NautilusAp
+@@ -1145,6 +1177,8 @@ update_dbus_opened_locations (NautilusAp
  
  	nautilus_freedesktop_dbus_set_open_locations (app->priv->fdb_manager,
  		                                      (const gchar**) locations_array);
@@ -84,16 +96,28 @@
  
  	g_free (locations_array);
  	g_list_free_full (locations, g_free);
-@@ -1155,7 +1177,7 @@ on_slot_location_changed (NautilusWindow
-                           GParamSpec          *pspec,
-                           NautilusApplication *application)
+@@ -1152,10 +1186,17 @@ update_dbus_opened_locations (NautilusAp
+ 
+ static void
+ on_slot_location_changed (NautilusWindowSlot  *slot,
+-                          GParamSpec          *pspec,
+-                          NautilusApplication *application)
++			  GParamSpec          *pspec,
++			  NautilusApplication *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
-@@ -1164,7 +1186,7 @@ on_slot_added (NautilusWindow      *wind
+@@ -1164,10 +1205,11 @@ on_slot_added (NautilusWindow      *wind
  	       NautilusApplication *application)
  {
  	if (nautilus_window_slot_get_location (slot)) {
@@ -102,7 +126,11 @@
  	}
  
  	g_signal_connect (slot, "notify::location", G_CALLBACK (on_slot_location_changed), application);
-@@ -1175,12 +1197,19 @@ on_slot_removed (NautilusWindow      *wi
++	g_signal_connect (slot, "active", G_CALLBACK (on_slot_active_changed), application);
+ }
+ 
+ static void
+@@ -1175,9 +1217,17 @@ on_slot_removed (NautilusWindow      *wi
  		 NautilusWindowSlot  *slot,
  		 NautilusApplication *application)
  {
@@ -110,20 +138,18 @@
 +	nautilus_application_update_dbus_opened_locations (application);
  
  	g_signal_handlers_disconnect_by_func (slot, on_slot_location_changed, application);
- }
- 
- static void
++	g_signal_handlers_disconnect_by_func (slot, on_slot_active_changed, application);
++}
++
++static void
 +on_realize (GtkWidget           *widget,
 +	    NautilusApplication *application)
 +{
 +	nautilus_application_update_dbus_opened_locations (application);
-+}
-+
-+static void
- nautilus_application_window_added (GtkApplication *app,
- 				   GtkWindow *window)
- {
-@@ -1190,6 +1219,7 @@ nautilus_application_window_added (GtkAp
+ }
+ 
+ static void
+@@ -1190,6 +1240,7 @@ nautilus_application_window_added (GtkAp
  
  	if (NAUTILUS_IS_WINDOW (window)) {
  		self->priv->windows = g_list_prepend (self->priv->windows, window);
@@ -131,7 +157,7 @@
  		g_signal_connect (window, "slot-added", G_CALLBACK (on_slot_added), app);
  		g_signal_connect (window, "slot-removed", G_CALLBACK (on_slot_removed), app);
  	}
-@@ -1205,6 +1235,7 @@ nautilus_application_window_removed (Gtk
+@@ -1205,6 +1256,7 @@ nautilus_application_window_removed (Gtk
  
  	if (NAUTILUS_IS_WINDOW (window)) {
  		self->priv->windows = g_list_remove_all (self->priv->windows, window);