Merge lp:~azzar1/unity/fix-1048274-6.0 into lp:unity/6.0

Proposed by Andrea Azzarone on 2012-10-12
Status: Merged
Approved by: Brandon Schaefer on 2012-10-15
Approved revision: 2777
Merged at revision: 2782
Proposed branch: lp:~azzar1/unity/fix-1048274-6.0
Merge into: lp:unity/6.0
Diff against target: 27 lines (+1/-3)
2 files modified
launcher/HudLauncherIcon.cpp (+0/-2)
launcher/HudLauncherIcon.h (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1048274-6.0
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2012-10-12 Approve on 2012-10-15
Review via email: mp+129370@code.launchpad.net

Commit message

Make HudLauncherIcon::ubus_manager_ "un-static" (LP bug 1048274)

Description of the change

== Problem ==
compiz crashed with SIGSEGV in std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string() from unity::launcher::HudLauncherIcon::OnHudIconChanged()

== Fix ==
HudLauncherIcon::ubus_manager_ should not be static.

== Test ==
Not applicable.

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

Still Looks good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/HudLauncherIcon.cpp'
2--- launcher/HudLauncherIcon.cpp 2012-09-07 15:03:13 +0000
3+++ launcher/HudLauncherIcon.cpp 2012-10-12 08:31:24 +0000
4@@ -37,8 +37,6 @@
5 nux::logging::Logger logger("unity.launcher.hudlaunchericon");
6 }
7
8-UBusManager HudLauncherIcon::ubus_manager_;
9-
10 HudLauncherIcon::HudLauncherIcon(LauncherHideMode hide_mode)
11 : SingleMonitorLauncherIcon(IconType::HUD, 0)
12 , launcher_hide_mode_(hide_mode)
13
14=== modified file 'launcher/HudLauncherIcon.h'
15--- launcher/HudLauncherIcon.h 2012-08-22 08:17:33 +0000
16+++ launcher/HudLauncherIcon.h 2012-10-12 08:31:24 +0000
17@@ -49,9 +49,9 @@
18 void OnOverlayShown(GVariant *data, bool visible);
19 void OnHudIconChanged(GVariant *data);
20
21- static unity::UBusManager ubus_manager_;
22 nux::Color background_color_;
23 LauncherHideMode launcher_hide_mode_;
24+ UBusManager ubus_manager_;
25 };
26
27 }

Subscribers

People subscribed via source and target branches