Merge lp:~robert-ancell/unity-settings-daemon/fix-shell-watch into lp:unity-settings-daemon

Proposed by Robert Ancell on 2015-10-01
Status: Merged
Approved by: Sebastien Bacher on 2015-10-01
Approved revision: 4096
Merged at revision: 4098
Proposed branch: lp:~robert-ancell/unity-settings-daemon/fix-shell-watch
Merge into: lp:unity-settings-daemon
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/xsettings/gsd-xsettings-manager.c (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/unity-settings-daemon/fix-shell-watch
Reviewer Review Type Date Requested Status
Sebastien Bacher 2015-10-01 Approve on 2015-10-01
Review via email: mp+273008@code.launchpad.net

Commit message

Fix shell watch callback not being destroyed.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

indeed!

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-06-07 19:13:44 +0000
3+++ plugins/xsettings/gsd-xsettings-manager.c 2015-10-01 02:43:41 +0000
4@@ -1008,7 +1008,7 @@
5 {
6 notify_have_shell (manager);
7 manager->priv->have_unity = TRUE;
8- manager->priv->shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
9+ manager->priv->unity_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
10 "com.canonical.AppMenu.Registrar",
11 0,
12 on_unity_appeared,

Subscribers

People subscribed via source and target branches