aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Terry <michael.terry@canonical.com>2012-09-10 11:30:56 -0400
committerMichael Terry <michael.terry@canonical.com>2012-09-10 11:30:56 -0400
commitf1649bd94ffa9d4a32c7f1c9c989054d3dc56901 (patch)
treed36a665ff3b93d66dd66a3812d793a71986832f9
parentf6c1a275c332c4bfabded410ed998a17b5bec6d4 (diff)
downloadlibdbusmenu-f1649bd94ffa9d4a32c7f1c9c989054d3dc56901.tar.gz
libdbusmenu-f1649bd94ffa9d4a32c7f1c9c989054d3dc56901.tar.bz2
libdbusmenu-f1649bd94ffa9d4a32c7f1c9c989054d3dc56901.zip
pay attention to GtkSettings's gtk-menu-images value as it changes on the client end
-rw-r--r--libdbusmenu-gtk/parser.c63
1 files changed, 63 insertions, 0 deletions
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index 2f7277c..419c15f 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -60,6 +60,9 @@ typedef struct _ParserData
gulong widget_accel_handler_id;
gulong widget_toggle_handler_id;
gulong widget_visible_handler_id;
+ gulong widget_screen_changed_handler_id;
+
+ gulong settings_notify_handler_id;
} ParserData;
@@ -116,6 +119,12 @@ static void widget_notify_cb (GtkWidget * widget,
static void widget_add_cb (GtkWidget * widget,
GtkWidget * child,
gpointer data);
+static void widget_screen_changed_cb (GtkWidget * widget,
+ GdkScreen * old_screen,
+ gpointer data);
+static void settings_notify_cb (GtkSettings * settings,
+ GParamSpec * pspec,
+ gpointer data);
static gboolean should_show_image (GtkImage * image);
static void menuitem_notify_cb (GtkWidget * widget,
GParamSpec * pspec,
@@ -130,6 +139,7 @@ static const char * interned_str_active = NULL;
static const char * interned_str_always_show_image = NULL;
static const char * interned_str_file = NULL;
static const char * interned_str_gicon = NULL;
+static const char * interned_str_gtk_menu_images = NULL;
static const char * interned_str_icon_name = NULL;
static const char * interned_str_icon_set = NULL;
static const char * interned_str_image = NULL;
@@ -155,6 +165,7 @@ ensure_interned_strings_loaded (void)
interned_str_always_show_image = g_intern_static_string ("always-show-image");
interned_str_file = g_intern_static_string ("file");
interned_str_gicon = g_intern_static_string ("gicon");
+ interned_str_gtk_menu_images = g_intern_static_string ("gtk-menu-images");
interned_str_icon_name = g_intern_static_string ("icon-name");
interned_str_icon_set = g_intern_static_string ("icon-set");
interned_str_image = g_intern_static_string ("image");
@@ -291,6 +302,9 @@ parser_data_free (ParserData * pdata)
dbusmenu_gtk_clear_signal_handler (o, &pdata->widget_accel_handler_id);
dbusmenu_gtk_clear_signal_handler (o, &pdata->widget_toggle_handler_id);
dbusmenu_gtk_clear_signal_handler (o, &pdata->widget_visible_handler_id);
+ dbusmenu_gtk_clear_signal_handler (o, &pdata->widget_screen_changed_handler_id);
+ dbusmenu_gtk_clear_signal_handler (gtk_widget_get_settings (GTK_WIDGET (o)),
+ &pdata->settings_notify_handler_id);
g_object_remove_weak_pointer(o, (gpointer*)&pdata->widget);
/* since the DbusmenuMenuitem is being destroyed, uncache it from the GtkWidget */
@@ -746,6 +760,10 @@ construct_dbusmenu_for_widget (GtkWidget * widget)
pdata->widget_add_handler_id = g_signal_connect (widget, "add",
G_CALLBACK (widget_add_cb), mi);
+ pdata->widget_screen_changed_handler_id = g_signal_connect (widget, "screen-changed",
+ G_CALLBACK (widget_screen_changed_cb), mi);
+ widget_screen_changed_cb (widget, NULL, mi);
+
return mi;
}
@@ -1282,6 +1300,51 @@ widget_add_cb (GtkWidget *widget,
handle_first_label (data);
}
+/* Pass NULL for pspec to update all settings at once */
+static void
+widget_screen_changed_cb (GtkWidget * widget, GdkScreen * old_screen, gpointer data)
+{
+ DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data);
+ g_return_if_fail (mi != NULL);
+
+ ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(mi), PARSER_DATA);
+
+ if (old_screen != NULL)
+ dbusmenu_gtk_clear_signal_handler (gtk_settings_get_for_screen (old_screen),
+ &pdata->settings_notify_handler_id);
+ pdata->settings_notify_handler_id = g_signal_connect (gtk_widget_get_settings (widget), "notify",
+ G_CALLBACK (settings_notify_cb), mi);
+
+ /* And update widget now that we have a new GtkSettings */
+ settings_notify_cb (gtk_widget_get_settings (widget), NULL, mi);
+}
+
+/* Pass NULL for pspec to update all settings at once */
+static void
+settings_notify_cb (GtkSettings * settings, GParamSpec * pspec, gpointer data)
+{
+ GValue prop_value = {0};
+ DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data);
+ g_return_if_fail (mi != NULL);
+
+ ensure_interned_strings_loaded ();
+
+ if (pspec != NULL)
+ {
+ g_value_init (&prop_value, pspec->value_type);
+ g_object_get_property (G_OBJECT (settings), pspec->name, &prop_value);
+ }
+
+ if (pspec == NULL || pspec->name == interned_str_gtk_menu_images)
+ {
+ ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(mi), PARSER_DATA);
+ update_icon (mi, pdata, GTK_IMAGE(pdata->image));
+ }
+
+ if (pspec != NULL)
+ g_value_unset (&prop_value);
+}
+
/* A child item was added to a menu we're watching. Let's try to integrate it. */
static void
item_inserted_cb (GtkContainer *menu,