Merge lp:~marcobiscaro2112/unity/fixes-726267 into lp:unity

Proposed by Marco Biscaro
Status: Merged
Merged at revision: 938
Proposed branch: lp:~marcobiscaro2112/unity/fixes-726267
Merge into: lp:unity
Diff against target: 47 lines (+14/-1)
2 files modified
src/PanelHomeButton.cpp (+11/-1)
src/PanelHomeButton.h (+3/-0)
To merge this branch: bzr merge lp:~marcobiscaro2112/unity/fixes-726267
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+52470@code.launchpad.net

Description of the change

Fix for bug #726267.

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Approved and merged, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/PanelHomeButton.cpp'
--- src/PanelHomeButton.cpp 2011-03-07 12:35:36 +0000
+++ src/PanelHomeButton.cpp 2011-03-07 20:32:44 +0000
@@ -52,7 +52,9 @@
52 OnMouseLeave.connect (sigc::mem_fun(this, &PanelHomeButton::RecvMouseLeave));52 OnMouseLeave.connect (sigc::mem_fun(this, &PanelHomeButton::RecvMouseLeave));
53 OnMouseMove.connect (sigc::mem_fun(this, &PanelHomeButton::RecvMouseMove));53 OnMouseMove.connect (sigc::mem_fun(this, &PanelHomeButton::RecvMouseMove));
5454
55 PanelStyle::GetDefault ()->changed.connect (sigc::mem_fun (this, &PanelHomeButton::Refresh));55 g_signal_connect (gtk_icon_theme_get_default (), "changed",
56 G_CALLBACK (PanelHomeButton::OnIconThemeChanged), this);
57
56 Refresh ();58 Refresh ();
57}59}
5860
@@ -225,3 +227,11 @@
225 g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (geo.width));227 g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (geo.width));
226 g_variant_builder_add (builder, "{sv}", "height", g_variant_new_int32 (geo.height));228 g_variant_builder_add (builder, "{sv}", "height", g_variant_new_int32 (geo.height));
227}229}
230
231void
232PanelHomeButton::OnIconThemeChanged (GtkIconTheme *icon_theme, gpointer data)
233{
234 PanelHomeButton* self = (PanelHomeButton*) data;
235
236 self->Refresh ();
237}
228238
=== modified file 'src/PanelHomeButton.h'
--- src/PanelHomeButton.h 2011-03-07 12:35:36 +0000
+++ src/PanelHomeButton.h 2011-03-07 20:32:44 +0000
@@ -20,6 +20,8 @@
20#ifndef PANEL_HOME_BUTTON_H20#ifndef PANEL_HOME_BUTTON_H
21#define PANEL_HOME_BUTTON_H21#define PANEL_HOME_BUTTON_H
2222
23#include <gtk/gtk.h>
24
23#include <Nux/TextureArea.h>25#include <Nux/TextureArea.h>
24#include <Nux/View.h>26#include <Nux/View.h>
25#include <NuxImage/CairoGraphics.h>27#include <NuxImage/CairoGraphics.h>
@@ -47,6 +49,7 @@
4749
48private:50private:
49 void Refresh ();51 void Refresh ();
52 static void OnIconThemeChanged (GtkIconTheme *icon_theme, gpointer data);
5053
51private:54private:
52 nux::CairoGraphics _util_cg;55 nux::CairoGraphics _util_cg;