Unity Settings Daemon

Merge lp:~larsu/unity-settings-daemon/lp1508327-again into lp:unity-settings-daemon

  1. lp1508327-again
  2. Merge into trunk
Proposed by Lars Karlitski on 2015-10-22
Status: Merged
Approved by: Didier Roche on 2015-10-22
Approved revision: 4112
Merged at revision: 4112
Proposed branch: lp:~larsu/unity-settings-daemon/lp1508327-again
Merge into: lp:unity-settings-daemon
Diff against target: 16 lines (+5/-1)
1 file modified
plugins/power/gsd-power-manager.c (+5/-1)
To merge this branch: bzr merge lp:~larsu/unity-settings-daemon/lp1508327-again
Reviewer Review Type Date Requested Status
Didier Roche 2015-10-22 Approve on 2015-10-22
Review via email: mp+275285@code.launchpad.net

Commit Message

power: disconnect signals from rr_screen

Description of the Change

power: disconnect signals from rr_screen

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Confirming that fixes the crash I was experiencing during ubiquity only mode. Looking sane as well, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/power/gsd-power-manager.c'
2--- plugins/power/gsd-power-manager.c 2015-10-21 10:45:16 +0000
3+++ plugins/power/gsd-power-manager.c 2015-10-22 09:06:24 +0000
4@@ -3482,7 +3482,11 @@
5 }
6
7 g_clear_object (&manager->priv->logind_proxy);
8- g_clear_object (&manager->priv->rr_screen);
9+
10+ if (manager->priv->rr_screen) {
11+ g_signal_handlers_disconnect_by_data (manager->priv->rr_screen, manager);
12+ g_clear_object (&manager->priv->rr_screen);
13+ }
14
15 devices = manager->priv->devices_array;
16 for (i = 0; i < devices->len; i++)

Subscribers

People subscribed via source and target branches