Merge lp:~seb128/unity-settings-daemon/xrandr_init_order into lp:unity-settings-daemon

[Sebastien Bacher]

[xrandr] slightly updated version of an upstream bugfix for a segfault issue

[xrandr] slightly updated version of an upstream bugfix for a segfault issue

[Marco Trevisan (Treviño) (3v1n0)]

Looks sane to me

review: Approve

=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c	2015-08-25 08:19:38 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c	2015-10-07 16:53:01 +0000
@@ -157,6 +157,7 @@
                                               GsdRRRotation *out_rotations);
 static void handle_fn_f7 (GsdXrandrManager *mgr, guint32 timestamp);
 static void handle_rotate_windows (GsdXrandrManager *mgr, GsdRRRotation rotation, guint32 timestamp);
+static void register_manager_dbus (GsdXrandrManager *manager);
 
 G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
 
@@ -2414,6 +2415,8 @@
         manager->priv->running = TRUE;
         manager->priv->settings = g_settings_new (CONF_SCHEMA);
 
+        register_manager_dbus (manager_object);
+
         show_timestamps_dialog (manager, "Startup");
         if (!apply_stored_configuration_at_startup (manager, GDK_CURRENT_TIME)) /* we don't have a real timestamp at startup anyway */
                 if (!apply_default_configuration_from_file (manager, GDK_CURRENT_TIME))
@@ -2463,6 +2466,9 @@
                 manager->priv->upower_client = NULL;
         }
 
+        if (manager->priv->name_id != 0)
+                g_bus_unown_name (manager->priv->name_id);
+
         if (manager->priv->introspection_data) {
                 g_dbus_node_info_unref (manager->priv->introspection_data);
                 manager->priv->introspection_data = NULL;
@@ -2522,9 +2528,6 @@
 
         g_return_if_fail (manager->priv != NULL);
 
-        if (manager->priv->name_id != 0)
-                g_bus_unown_name (manager->priv->name_id);
-
         G_OBJECT_CLASS (gsd_xrandr_manager_parent_class)->finalize (object);
 }
 
@@ -2669,8 +2672,6 @@
                 manager_object = g_object_new (GSD_TYPE_XRANDR_MANAGER, NULL);
                 g_object_add_weak_pointer (manager_object,
                                            (gpointer *) &manager_object);
-
-                register_manager_dbus (manager_object);
         }
 
         return GSD_XRANDR_MANAGER (manager_object);