Merge lp:~3v1n0/unity/glib-signal-safer-cb into lp:unity

[Marco Trevisan (Treviño)]

GLibSignal: don't call callback function if the object_ value is not matching the CB

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3873
http://jenkins.qa.ubuntu.com/job/unity-ci/1100/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/187/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/187

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1100/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Great, looks good and no longer crashes. Thanks!

review: Approve

=== modified file 'UnityCore/GLibSignal-inl.h'
--- UnityCore/GLibSignal-inl.h	2012-08-30 18:14:19 +0000
+++ UnityCore/GLibSignal-inl.h	2014-10-15 05:28:09 +0000
@@ -52,7 +52,11 @@
 template <typename R, typename G, typename... Ts>
 R Signal<R, G, Ts...>::Callback(G object, Ts... vs, Signal* self)
 {
-  return self->callback_(object, vs...);
+  /* For some weird reasons, this might not be always true (see bug #1366351) */
+  if (reinterpret_cast<GObject*>(object) == self->object_)
+    return self->callback_(object, vs...);
+
+  return R();
 }
 
 }

=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2014-03-20 05:05:21 +0000
+++ unity-shared/StaticCairoText.cpp	2014-10-15 05:28:09 +0000
@@ -34,6 +34,7 @@
 #include <pango/pangocairo.h>
 
 #include <UnityCore/GLibWrapper.h>
+#include <UnityCore/GLibSignal.h>
 
 #include "CairoTexture.h"
 #include "UnitySettings.h"
@@ -45,7 +46,6 @@
 struct StaticCairoText::Impl : sigc::trackable
 {
   Impl(StaticCairoText* parent, std::string const& text);
-  ~Impl();
 
   PangoEllipsizeMode GetPangoEllipsizeMode() const;
   PangoAlignment GetPangoAlignment() const;
@@ -77,8 +77,6 @@
   void UpdateTexture();
   void OnFontChanged();
 
-  static void FontChanged(GObject* gobject, GParamSpec* pspec, gpointer data);
-
   StaticCairoText* parent_;
   bool accept_key_nav_focus_;
   mutable bool need_new_extent_cache_;
@@ -106,6 +104,8 @@
   int actual_lines_;
   float line_spacing_;
   double scale_;
+
+  glib::Signal<void, GtkSettings*, GParamSpec*> font_changed_;
 };
 
 StaticCairoText::Impl::Impl(StaticCairoText* parent, std::string const& text)
@@ -126,21 +126,10 @@
   , line_spacing_(0.5)
   , scale_(1.0f)
 {
-  GtkSettings* settings = gtk_settings_get_default();  // not ref'ed
-  g_signal_connect(settings, "notify::gtk-font-name",
-                   (GCallback)FontChanged, this);
-
+  font_changed_.Connect(gtk_settings_get_default(), "notify::gtk-font-name", sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::OnFontChanged))));
   Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::OnFontChanged)));
 }
 
-StaticCairoText::Impl::~Impl()
-{
-  GtkSettings* settings = gtk_settings_get_default();  // not ref'ed
-  g_signal_handlers_disconnect_by_func(settings,
-                                       (void*)FontChanged,
-                                       this);
-}
-
 PangoEllipsizeMode StaticCairoText::Impl::GetPangoEllipsizeMode() const
 {
   switch (ellipsize_)
@@ -780,14 +769,6 @@
   }
 }
 
-void StaticCairoText::Impl::FontChanged(GObject* gobject,
-                                        GParamSpec* pspec,
-                                        gpointer data)
-{
-  StaticCairoText::Impl* self = static_cast<StaticCairoText::Impl*>(data);
-  self->OnFontChanged();
-}
-
 void StaticCairoText::Impl::OnFontChanged()
 {
   need_new_extent_cache_ = true;