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

[Marco Trevisan (Treviño)]

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

482. By Marco Trevisan (Treviño) on 2015-11-30

debian/patches/19_unity_open_location_xid.patch: check for window type, not display

[Sebastien Bacher (seb128)]

thanks, that fixes the segfault

review: Approve

=== modified file 'debian/patches/19_unity_open_location_xid.patch'
--- debian/patches/19_unity_open_location_xid.patch	2015-11-26 17:42:33 +0000
+++ debian/patches/19_unity_open_location_xid.patch	2015-11-30 15:16:32 +0000
@@ -32,7 +32,7 @@
  {
  	gint i;
  	GList *l, *sl;
-@@ -1113,15 +1113,36 @@ update_dbus_opened_locations (NautilusAp
+@@ -1113,15 +1113,40 @@ update_dbus_opened_locations (NautilusAp
  
  	g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
  
@@ -47,12 +47,16 @@
 +		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);
++
++		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);
++			}
 +		}
 +
  		for (sl = nautilus_window_get_slots (window); sl; sl = sl->next) {
@@ -69,7 +73,7 @@
  				GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
  
  				if (!found) {
-@@ -1132,6 +1153,21 @@ update_dbus_opened_locations (NautilusAp
+@@ -1132,6 +1157,21 @@ update_dbus_opened_locations (NautilusAp
  				}
  			}
  		}
@@ -78,7 +82,7 @@
 +			guint32 window_id = 0;
 +			GdkWindow *gdk_win = gtk_widget_get_window (GTK_WIDGET (l->data));
 +#ifdef GDK_WINDOWING_X11
-+			if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
++			if (GDK_IS_X11_WINDOW (gdk_win)) {
 +				window_id = gdk_x11_window_get_xid (gdk_win);
 +			} else {
 +				window_id = GPOINTER_TO_UINT(gdk_win);
@@ -91,7 +95,7 @@
  	}
  
  	locations_array = g_new (gchar*, locations_size + 1);
-@@ -1145,6 +1181,8 @@ update_dbus_opened_locations (NautilusAp
+@@ -1145,6 +1185,8 @@ update_dbus_opened_locations (NautilusAp
  
  	nautilus_freedesktop_dbus_set_open_locations (app->priv->fdb_manager,
  		                                      (const gchar**) locations_array);
@@ -100,7 +104,7 @@
  
  	g_free (locations_array);
  	g_list_free_full (locations, g_free);
-@@ -1152,10 +1190,17 @@ update_dbus_opened_locations (NautilusAp
+@@ -1152,10 +1194,17 @@ update_dbus_opened_locations (NautilusAp
  
  static void
  on_slot_location_changed (NautilusWindowSlot  *slot,
@@ -108,20 +112,20 @@
 -                          NautilusApplication *application)
 +			  GParamSpec          *pspec,
 +			  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
-@@ -1164,10 +1209,11 @@ on_slot_added (NautilusWindow      *wind
+@@ -1164,10 +1213,11 @@ on_slot_added (NautilusWindow      *wind
  	       NautilusApplication *application)
  {
  	if (nautilus_window_slot_get_location (slot)) {
@@ -134,7 +138,7 @@
  }
  
  static void
-@@ -1175,9 +1221,17 @@ on_slot_removed (NautilusWindow      *wi
+@@ -1175,9 +1225,17 @@ on_slot_removed (NautilusWindow      *wi
  		 NautilusWindowSlot  *slot,
  		 NautilusApplication *application)
  {
@@ -153,7 +157,7 @@
  }
  
  static void
-@@ -1190,6 +1244,7 @@ nautilus_application_window_added (GtkAp
+@@ -1190,6 +1248,7 @@ nautilus_application_window_added (GtkAp
  
  	if (NAUTILUS_IS_WINDOW (window)) {
  		self->priv->windows = g_list_prepend (self->priv->windows, window);
@@ -161,7 +165,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 +1260,7 @@ nautilus_application_window_removed (Gtk
+@@ -1205,6 +1264,7 @@ nautilus_application_window_removed (Gtk
  
  	if (NAUTILUS_IS_WINDOW (window)) {
  		self->priv->windows = g_list_remove_all (self->priv->windows, window);