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
1=== modified file 'src/PanelHomeButton.cpp'
2--- src/PanelHomeButton.cpp 2011-03-07 12:35:36 +0000
3+++ src/PanelHomeButton.cpp 2011-03-07 20:32:44 +0000
4@@ -52,7 +52,9 @@
5 OnMouseLeave.connect (sigc::mem_fun(this, &PanelHomeButton::RecvMouseLeave));
6 OnMouseMove.connect (sigc::mem_fun(this, &PanelHomeButton::RecvMouseMove));
7
8- PanelStyle::GetDefault ()->changed.connect (sigc::mem_fun (this, &PanelHomeButton::Refresh));
9+ g_signal_connect (gtk_icon_theme_get_default (), "changed",
10+ G_CALLBACK (PanelHomeButton::OnIconThemeChanged), this);
11+
12 Refresh ();
13 }
14
15@@ -225,3 +227,11 @@
16 g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (geo.width));
17 g_variant_builder_add (builder, "{sv}", "height", g_variant_new_int32 (geo.height));
18 }
19+
20+void
21+PanelHomeButton::OnIconThemeChanged (GtkIconTheme *icon_theme, gpointer data)
22+{
23+ PanelHomeButton* self = (PanelHomeButton*) data;
24+
25+ self->Refresh ();
26+}
27
28=== modified file 'src/PanelHomeButton.h'
29--- src/PanelHomeButton.h 2011-03-07 12:35:36 +0000
30+++ src/PanelHomeButton.h 2011-03-07 20:32:44 +0000
31@@ -20,6 +20,8 @@
32 #ifndef PANEL_HOME_BUTTON_H
33 #define PANEL_HOME_BUTTON_H
34
35+#include <gtk/gtk.h>
36+
37 #include <Nux/TextureArea.h>
38 #include <Nux/View.h>
39 #include <NuxImage/CairoGraphics.h>
40@@ -47,6 +49,7 @@
41
42 private:
43 void Refresh ();
44+ static void OnIconThemeChanged (GtkIconTheme *icon_theme, gpointer data);
45
46 private:
47 nux::CairoGraphics _util_cg;