Unity Settings Daemon

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

  1. xrandr_init_order
  2. Merge into trunk
Proposed by Sebastien Bacher on 2015-10-07
Status: Merged
Approved by: Sebastien Bacher on 2015-10-09
Approved revision: 4101
Merged at revision: 4104
Proposed branch: lp:~seb128/unity-settings-daemon/xrandr_init_order
Merge into: lp:unity-settings-daemon
Diff against target: 49 lines (+6/-5)
1 file modified
plugins/xrandr/gsd-xrandr-manager.c (+6/-5)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/xrandr_init_order
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2015-10-09
Unity Settings Daemon Development Team 2015-10-07 Pending
Review via email: mp+273728@code.launchpad.net

Commit Message

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

Description of the Change

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

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks sane to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
2--- plugins/xrandr/gsd-xrandr-manager.c 2015-08-25 08:19:38 +0000
3+++ plugins/xrandr/gsd-xrandr-manager.c 2015-10-07 16:53:01 +0000
4@@ -157,6 +157,7 @@
5 GsdRRRotation *out_rotations);
6 static void handle_fn_f7 (GsdXrandrManager *mgr, guint32 timestamp);
7 static void handle_rotate_windows (GsdXrandrManager *mgr, GsdRRRotation rotation, guint32 timestamp);
8+static void register_manager_dbus (GsdXrandrManager *manager);
9
10 G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
11
12@@ -2414,6 +2415,8 @@
13 manager->priv->running = TRUE;
14 manager->priv->settings = g_settings_new (CONF_SCHEMA);
15
16+ register_manager_dbus (manager_object);
17+
18 show_timestamps_dialog (manager, "Startup");
19 if (!apply_stored_configuration_at_startup (manager, GDK_CURRENT_TIME)) /* we don't have a real timestamp at startup anyway */
20 if (!apply_default_configuration_from_file (manager, GDK_CURRENT_TIME))
21@@ -2463,6 +2466,9 @@
22 manager->priv->upower_client = NULL;
23 }
24
25+ if (manager->priv->name_id != 0)
26+ g_bus_unown_name (manager->priv->name_id);
27+
28 if (manager->priv->introspection_data) {
29 g_dbus_node_info_unref (manager->priv->introspection_data);
30 manager->priv->introspection_data = NULL;
31@@ -2522,9 +2528,6 @@
32
33 g_return_if_fail (manager->priv != NULL);
34
35- if (manager->priv->name_id != 0)
36- g_bus_unown_name (manager->priv->name_id);
37-
38 G_OBJECT_CLASS (gsd_xrandr_manager_parent_class)->finalize (object);
39 }
40
41@@ -2669,8 +2672,6 @@
42 manager_object = g_object_new (GSD_TYPE_XRANDR_MANAGER, NULL);
43 g_object_add_weak_pointer (manager_object,
44 (gpointer *) &manager_object);
45-
46- register_manager_dbus (manager_object);
47 }
48
49 return GSD_XRANDR_MANAGER (manager_object);

Subscribers

People subscribed via source and target branches