Merge lp:~seb128/unity-settings-daemon/xsettings-unload-segfault into lp:unity-settings-daemon

Proposed by Sebastien Bacher
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4112
Merged at revision: 4113
Proposed branch: lp:~seb128/unity-settings-daemon/xsettings-unload-segfault
Merge into: lp:unity-settings-daemon
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/xsettings/gsd-xsettings-manager.c (+1/-0)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/xsettings-unload-segfault
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
Unity Settings Daemon Development Team Pending
Review via email: mp+275295@code.launchpad.net

Commit message

xsettings: disconnect signal from plugin_settings

Description of the change

xsettings: disconnect signal from plugin_settings

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

Good catch, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
2--- plugins/xsettings/gsd-xsettings-manager.c 2015-10-12 11:21:35 +0000
3+++ plugins/xsettings/gsd-xsettings-manager.c 2015-10-22 10:15:59 +0000
4@@ -1144,6 +1144,7 @@
5 }
6
7 if (p->plugin_settings != NULL) {
8+ g_signal_handlers_disconnect_by_data (p->plugin_settings, manager);
9 g_object_unref (p->plugin_settings);
10 p->plugin_settings = NULL;
11 }

Subscribers

People subscribed via source and target branches