Merge lp:~nicovdw/unity/fix-for-759886 into lp:unity

[Nico van der Walt]

added the OnFontChanged method to the PanelIndicatorObjectEntryView class that gets called when the user changed the system font. This method will refresh the indicators to apply the new font.

[Didier Roche-Tolomelli (didrocks)]

(Gord is making the review, just a note: do not forget to reset _on_font_changed_connection to 0 in the callback)

[Didier Roche-Tolomelli (didrocks)]

forget about my comment, too many g_source_remove yesterday ;)

=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
--- src/PanelIndicatorObjectEntryView.cpp	2011-04-06 17:53:41 +0000
+++ src/PanelIndicatorObjectEntryView.cpp	2011-04-15 14:59:23 +0000
@@ -46,6 +46,8 @@
   _on_indicator_updated_connection = _proxy->updated.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::Refresh));
   _padding = padding;
 
+  _on_font_changed_connection = g_signal_connect (gtk_settings_get_default (), "notify::gtk-font-name", (GCallback) &PanelIndicatorObjectEntryView::OnFontChanged, this);
+
   InputArea::OnMouseDown.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnMouseDown));
   InputArea::OnMouseWheel.connect (sigc::mem_fun (this, &PanelIndicatorObjectEntryView::OnMouseWheel));
 
@@ -58,6 +60,7 @@
   _on_indicator_activate_changed_connection.disconnect ();
   _on_indicator_updated_connection.disconnect ();
   _on_panelstyle_changed_connection.disconnect ();
+  g_signal_handler_disconnect (gtk_settings_get_default (), _on_font_changed_connection);
 }
 
 void
@@ -430,3 +433,11 @@
 {
   return _proxy ? _proxy->show_now : false;
 }
+
+void
+PanelIndicatorObjectEntryView::OnFontChanged (GObject *gobject, GParamSpec *pspec, gpointer data)
+{
+  PanelIndicatorObjectEntryView *self = (PanelIndicatorObjectEntryView*) data;
+
+  self->Refresh();
+}
 
=== modified file 'src/PanelIndicatorObjectEntryView.h'
--- src/PanelIndicatorObjectEntryView.h	2011-03-29 12:23:52 +0000
+++ src/PanelIndicatorObjectEntryView.h	2011-04-15 14:59:23 +0000
@@ -61,6 +61,8 @@
   sigc::connection _on_indicator_updated_connection;
   sigc::connection _on_panelstyle_changed_connection;
 
+  gulong _on_font_changed_connection;
+  static void OnFontChanged (GObject *gobject, GParamSpec *pspec, gpointer data);
 };
 
 #endif // PANEL_INDICATOR_OBJECT_ENTRY_VIEW_H