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

[Andrea Azzarone]

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

== 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.

[Brandon Schaefer (brandontschaefer)]

Still Looks good :)

review: Approve

=== modified file 'launcher/HudLauncherIcon.cpp'
--- launcher/HudLauncherIcon.cpp	2012-09-07 15:03:13 +0000
+++ launcher/HudLauncherIcon.cpp	2012-10-12 08:31:24 +0000
@@ -37,8 +37,6 @@
 nux::logging::Logger logger("unity.launcher.hudlaunchericon");
 }
 
-UBusManager HudLauncherIcon::ubus_manager_;
-
 HudLauncherIcon::HudLauncherIcon(LauncherHideMode hide_mode)
  : SingleMonitorLauncherIcon(IconType::HUD, 0)
  , launcher_hide_mode_(hide_mode)
 
=== modified file 'launcher/HudLauncherIcon.h'
--- launcher/HudLauncherIcon.h	2012-08-22 08:17:33 +0000
+++ launcher/HudLauncherIcon.h	2012-10-12 08:31:24 +0000
@@ -49,9 +49,9 @@
   void OnOverlayShown(GVariant *data, bool visible);
   void OnHudIconChanged(GVariant *data);
 
-  static unity::UBusManager ubus_manager_;
   nux::Color background_color_;
   LauncherHideMode launcher_hide_mode_;
+  UBusManager ubus_manager_;
 };
 
 }