Merge lp:~thumper/unity/no-lambda-for-bug-964897 into lp:unity

[Tim Penhey]

Changed code to get a better, readable stack trace for bug 964897

I'm at a bit of a loss as to how this bug is raising itself.

The lambda doesn't help in tracking this down, so I've extracted the method in the hope that should this happen again, we'll get a better stack trace.

That is all.

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'launcher/HudLauncherIcon.cpp'
--- launcher/HudLauncherIcon.cpp	2012-08-15 02:51:33 +0000
+++ launcher/HudLauncherIcon.cpp	2012-08-23 01:08:21 +0000
@@ -20,6 +20,7 @@
 #include "HudLauncherIcon.h"
 #include "Launcher.h"
 #include "UnityCore/GLibWrapper.h"
+#include "UnityCore/Variant.h"
 #include <NuxCore/Logger.h>
 
 #include "unity-shared/UBusMessages.h"
@@ -50,30 +51,33 @@
 
   background_color_ = nux::color::White;
 
-  ubus_manager_.RegisterInterest(UBUS_HUD_ICON_CHANGED, [&](GVariant *data)
-  {
-    std::string hud_icon_name;
-    const gchar* data_string = g_variant_get_string(data, NULL);
-    if (data_string)
-      hud_icon_name = data_string;
-    LOG_DEBUG(logger) << "Hud icon change: " << hud_icon_name;
-    if (hud_icon_name != icon_name)
-    {
-      if (hud_icon_name.empty())
-        icon_name = PKGDATADIR"/launcher_bfb.png";
-      else
-        icon_name = hud_icon_name;
-
-      EmitNeedsRedraw();
-    }
-  });
-
-  ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::bind(sigc::mem_fun(this, &HudLauncherIcon::OnOverlayShown), true));
-  ubus_manager_.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::bind(sigc::mem_fun(this, &HudLauncherIcon::OnOverlayShown), false));
+  ubus_manager_.RegisterInterest(UBUS_HUD_ICON_CHANGED,
+                                 sigc::mem_fun(this, &HudLauncherIcon::OnHudIconChanged));
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN,
+                                 sigc::bind(sigc::mem_fun(this, &HudLauncherIcon::OnOverlayShown),
+                                            true));
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_HIDDEN,
+                                 sigc::bind(sigc::mem_fun(this, &HudLauncherIcon::OnOverlayShown),
+                                            false));
 
   mouse_enter.connect([&](int m) { ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW); });
 }
 
+void HudLauncherIcon::OnHudIconChanged(GVariant *data)
+{
+  std::string hud_icon_name = glib::Variant(data).GetString();
+  LOG_DEBUG(logger) << "Hud icon change: " << hud_icon_name;
+  if (hud_icon_name != icon_name)
+  {
+    if (hud_icon_name.empty())
+      icon_name = PKGDATADIR"/launcher_bfb.png";
+    else
+      icon_name = hud_icon_name;
+
+    EmitNeedsRedraw();
+  }
+}
+
 void HudLauncherIcon::SetHideMode(LauncherHideMode hide_mode)
 {
   if (launcher_hide_mode_ != hide_mode)

=== modified file 'launcher/HudLauncherIcon.h'
--- launcher/HudLauncherIcon.h	2012-08-15 02:51:33 +0000
+++ launcher/HudLauncherIcon.h	2012-08-23 01:08:21 +0000
@@ -47,6 +47,7 @@
 
 private:
   void OnOverlayShown(GVariant *data, bool visible);
+  void OnHudIconChanged(GVariant *data);
 
   static unity::UBusManager ubus_manager_;
   nux::Color background_color_;