Merge lp:~3v1n0/nautilus/unity-xids-warning-fix into lp:~ubuntu-desktop/nautilus/ubuntu

[Marco Trevisan (Treviño)]

debian/patches/19_unity_open_location_xid.patch:
 - don't try to call functions on null objects
 - delay dbus registration until we don't have a bus

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-27 16:05:45 +0000
+++ debian/changelog	2014-02-28 07:41:23 +0000
@@ -1,3 +1,11 @@
+nautilus (1:3.10.1-0ubuntu7) UNRELEASED; urgency=medium
+
+  * debian/patches/19_unity_open_location_xid.patch:
+    - don't try to call functions on null objects
+    - delay dbus registration until we don't have a bus
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 28 Feb 2014 08:29:59 +0100
+
 nautilus (1:3.10.1-0ubuntu6) trusty; urgency=medium
 
   * debian/patches/restore-traditional-menu-bar.patch:

=== modified file 'debian/patches/19_unity_open_location_xid.patch'
--- debian/patches/19_unity_open_location_xid.patch	2014-01-15 01:39:50 +0000
+++ debian/patches/19_unity_open_location_xid.patch	2014-02-28 07:41:23 +0000
@@ -6,10 +6,10 @@
 Forwarded: no
 Author: Marco Trevisan <[e-mail]>
 
-Index: nautilus-3.8.2/data/freedesktop-dbus-interfaces.xml
+Index: nautilus-3.10.1/data/freedesktop-dbus-interfaces.xml
 ===================================================================
---- nautilus-3.8.2.orig/data/freedesktop-dbus-interfaces.xml	2014-01-15 14:31:50.053605541 +1300
-+++ nautilus-3.8.2/data/freedesktop-dbus-interfaces.xml	2014-01-15 14:31:50.045605541 +1300
+--- nautilus-3.10.1.orig/data/freedesktop-dbus-interfaces.xml	2014-02-28 08:10:33.234230706 +0100
++++ nautilus-3.10.1/data/freedesktop-dbus-interfaces.xml	2014-02-28 08:10:33.226230736 +0100
 @@ -33,5 +33,6 @@
        <arg type='s' name='StartupId' direction='in'/>
      </method>
@@ -17,11 +17,22 @@
 +    <property name="XUbuntuOpenLocationsXids" type="a{uas}" access="read"/>
    </interface>
  </node>
-Index: nautilus-3.8.2/src/nautilus-application.c
+Index: nautilus-3.10.1/src/nautilus-application.c
 ===================================================================
---- nautilus-3.8.2.orig/src/nautilus-application.c	2014-01-15 14:31:50.053605541 +1300
-+++ nautilus-3.8.2/src/nautilus-application.c	2014-01-15 14:31:50.049605541 +1300
-@@ -1687,6 +1687,11 @@
+--- nautilus-3.10.1.orig/src/nautilus-application.c	2014-02-28 08:10:33.234230706 +0100
++++ nautilus-3.10.1/src/nautilus-application.c	2014-02-28 08:26:18.701088671 +0100
+@@ -1653,8 +1653,8 @@
+ 	G_APPLICATION_CLASS (nautilus_application_parent_class)->quit_mainloop (app);
+ }
+ 
+-static void
+-update_dbus_opened_locations (NautilusApplication *app)
++void
++nautilus_application_update_dbus_opened_locations (NautilusApplication *app)
+ {
+ 	gint i;
+ 	GList *l, *sl;
+@@ -1664,6 +1664,11 @@
  
  	g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
  
@@ -33,7 +44,7 @@
  	for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = l->next) {
  		NautilusWindow *win = NAUTILUS_WINDOW (l->data);
  
-@@ -1694,11 +1699,15 @@
+@@ -1671,11 +1676,15 @@
  			continue;
  		}
  
@@ -49,7 +60,7 @@
  				GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
  
  				if (!found) {
-@@ -1709,6 +1718,17 @@
+@@ -1686,6 +1695,17 @@
  				}
  			}
  		}
@@ -67,7 +78,7 @@
  	}
  
  	locations_array = g_new (gchar*, locations_size + 1);
-@@ -1722,6 +1742,8 @@
+@@ -1699,6 +1719,8 @@
  
  	nautilus_freedesktop_dbus_set_open_locations (app->priv->fdb_manager,
  		                                      (const gchar**) locations_array);
@@ -76,14 +87,39 @@
  
  	g_free (locations_array);
  	g_list_free_full (locations, g_free);
-@@ -1759,14 +1781,24 @@
+@@ -1710,7 +1732,7 @@
+  			  const char         *to,
+ 			  NautilusApplication *application)
+ {
+-	update_dbus_opened_locations (application);
++	nautilus_application_update_dbus_opened_locations (application);
+ }
+ 
+ static void
+@@ -1719,7 +1741,7 @@
+ 	       NautilusApplication *application)
+ {
+ 	if (nautilus_window_slot_get_location (slot)) {
+-		update_dbus_opened_locations (application);
++		nautilus_application_update_dbus_opened_locations (application);
+ 	}
+ 
+ 	g_signal_connect (slot, "location-changed", G_CALLBACK (on_slot_location_changed), application);
+@@ -1730,20 +1752,30 @@
+ 		 NautilusWindowSlot  *slot,
+ 		 NautilusApplication *application)
+ {
+-	update_dbus_opened_locations (application);
++	nautilus_application_update_dbus_opened_locations (application);
+ 
+ 	g_signal_handlers_disconnect_by_func (slot, on_slot_location_changed, application);
  }
  
  static void
 +on_realize (GtkWidget           *widget,
 +	    NautilusApplication *application)
 +{
-+	update_dbus_opened_locations (application);
++	nautilus_application_update_dbus_opened_locations (application);
 +}
 +
 +static void
@@ -103,7 +139,7 @@
  }
  
  static void
-@@ -1784,8 +1816,11 @@
+@@ -1761,8 +1793,11 @@
  		nautilus_previewer_call_close (previewer);
  	}
  
@@ -117,30 +153,44 @@
  }
  
  static void
-Index: nautilus-3.8.2/src/nautilus-freedesktop-dbus.c
+Index: nautilus-3.10.1/src/nautilus-freedesktop-dbus.c
 ===================================================================
---- nautilus-3.8.2.orig/src/nautilus-freedesktop-dbus.c	2014-01-15 14:31:50.053605541 +1300
-+++ nautilus-3.8.2/src/nautilus-freedesktop-dbus.c	2014-01-15 14:31:50.049605541 +1300
-@@ -229,6 +229,15 @@
- 	nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations);
+--- nautilus-3.10.1.orig/src/nautilus-freedesktop-dbus.c	2014-02-28 08:10:33.234230706 +0100
++++ nautilus-3.10.1/src/nautilus-freedesktop-dbus.c	2014-02-28 08:28:42.141160665 +0100
+@@ -160,6 +160,9 @@
+ 	g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fdb->skeleton), conn, NAUTILUS_FDO_DBUS_PATH, NULL);
+ 
+ 	g_dbus_object_manager_server_set_connection (fdb->object_manager, conn);
++
++	NautilusApplication *application = NAUTILUS_APPLICATION (g_application_get_default ());
++	nautilus_application_update_dbus_opened_locations (application);
  }
  
+ static void
+@@ -226,7 +229,18 @@
+ {
+ 	g_return_if_fail (NAUTILUS_IS_FREEDESKTOP_DBUS (fdb));
+ 
+-	nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations);
++	if (fdb->skeleton)
++		nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations);
++}
++
 +void
 +nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb,
 +						   GVariant *locations)
 +{
 +	g_return_if_fail (NAUTILUS_IS_FREEDESKTOP_DBUS (fdb));
 +
-+	nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (fdb->skeleton, locations);
-+}
-+
++	if (fdb->skeleton)
++		nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (fdb->skeleton, locations);
+ }
+ 
  /* Tries to own the org.freedesktop.FileManager1 service name */
- NautilusFreedesktopDBus *
- nautilus_freedesktop_dbus_new (void)
-Index: nautilus-3.8.2/src/nautilus-freedesktop-dbus.h
+Index: nautilus-3.10.1/src/nautilus-freedesktop-dbus.h
 ===================================================================
---- nautilus-3.8.2.orig/src/nautilus-freedesktop-dbus.h	2014-01-15 14:31:50.053605541 +1300
-+++ nautilus-3.8.2/src/nautilus-freedesktop-dbus.h	2014-01-15 14:31:50.049605541 +1300
+--- nautilus-3.10.1.orig/src/nautilus-freedesktop-dbus.h	2014-02-28 08:10:33.234230706 +0100
++++ nautilus-3.10.1/src/nautilus-freedesktop-dbus.h	2014-02-28 08:23:31.569108325 +0100
 @@ -48,5 +48,6 @@
  NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);