Merge lp:~gordallott/unity/fixes-18-04-11 into lp:unity

Proposed by Gord Allott on 2011-04-18
Status: Merged
Merged at revision: 1149
Proposed branch: lp:~gordallott/unity/fixes-18-04-11
Merge into: lp:unity
Diff against target: 27 lines (+6/-0)
2 files modified
src/LauncherIcon.cpp (+3/-0)
src/PlacesView.cpp (+3/-0)
To merge this branch: bzr merge lp:~gordallott/unity/fixes-18-04-11
Reviewer Review Type Date Requested Status
Didier Roche 2011-04-18 Approve on 2011-04-18
Review via email: mp+58169@code.launchpad.net

Description of the change

fixes linked bugs

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

Approved!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/LauncherIcon.cpp'
2--- src/LauncherIcon.cpp 2011-04-14 14:29:40 +0000
3+++ src/LauncherIcon.cpp 2011-04-18 17:37:35 +0000
4@@ -138,6 +138,9 @@
5 _superkey_label->UnReference ();
6
7 // clean up the whole signal-callback mess
8+ if (needs_redraw_connection.connected ())
9+ needs_redraw_connection.disconnect ();
10+
11 if (on_icon_added_connection.connected ())
12 on_icon_added_connection.disconnect ();
13
14
15=== modified file 'src/PlacesView.cpp'
16--- src/PlacesView.cpp 2011-04-15 09:49:41 +0000
17+++ src/PlacesView.cpp 2011-04-18 17:37:35 +0000
18@@ -147,6 +147,9 @@
19 PlacesView::~PlacesView ()
20 {
21 UBusServer* ubus = ubus_server_get_default ();
22+ if (_home_button_hover > 0)
23+ ubus_server_unregister_interest (ubus, _home_button_hover);
24+
25 for (unsigned int i = 0; i < G_N_ELEMENTS (_ubus_handles); i++)
26 {
27 if (_ubus_handles[i] != 0)