aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Russell <crussell@canonical.com>2010-01-12 08:56:42 -0600
committerTed Gould <ted@gould.cx>2010-01-12 08:56:42 -0600
commit6fe9571a148ad6f4aba4a925f013a140b5d7bd59 (patch)
tree7270c05c7170a63fe7a4013f8355181197701a75
parent0fda6a0de6a9fcc29b2e202e7820bdf1c90883db (diff)
parent6ae0ede4751cc8fc10b46bc9e252568ff8cbb16d (diff)
downloadlibayatana-appindicator-6fe9571a148ad6f4aba4a925f013a140b5d7bd59.tar.gz
libayatana-appindicator-6fe9571a148ad6f4aba4a925f013a140b5d7bd59.tar.bz2
libayatana-appindicator-6fe9571a148ad6f4aba4a925f013a140b5d7bd59.zip
Mirror the icon changes over dbus
-rw-r--r--example/simple-client.c12
-rw-r--r--src/libappindicator/app-indicator.c89
2 files changed, 85 insertions, 16 deletions
diff --git a/example/simple-client.c b/example/simple-client.c
index b1d9fc2..8ff3827 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -43,6 +43,13 @@ toggle_sensitivity_cb (GtkWidget *widget, gpointer data)
gtk_widget_set_sensitive (target, !GTK_WIDGET_IS_SENSITIVE (target));
}
+static void
+image_clicked_cb (GtkWidget *widget, gpointer data)
+{
+ gtk_image_set_from_stock (GTK_IMAGE (GTK_IMAGE_MENU_ITEM (widget)->image),
+ GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+}
+
int
main (int argc, char ** argv)
{
@@ -82,6 +89,11 @@ main (int argc, char ** argv)
G_CALLBACK (toggle_sensitivity_cb), item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), toggle_item);
+ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_NEW, NULL);
+ g_signal_connect (item, "activate",
+ G_CALLBACK (image_clicked_cb), NULL);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
app_indicator_set_menu (ci, GTK_MENU (menu));
mainloop = g_main_loop_new(NULL, FALSE);
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 0767734..84d9ebd 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -744,6 +744,64 @@ menuitem_iterate (GtkWidget *widget,
}
static void
+update_icon_name (DbusmenuMenuitem *menuitem,
+ GtkImage *image)
+{
+ if (gtk_image_get_storage_type (image) != GTK_IMAGE_ICON_NAME)
+ return;
+
+ dbusmenu_menuitem_property_set (menuitem,
+ DBUSMENU_MENUITEM_PROP_ICON,
+ image->data.name.icon_name);
+}
+
+/* return value specifies whether the label is set or not */
+static gboolean
+update_stock_item (DbusmenuMenuitem *menuitem,
+ GtkImage *image)
+{
+ GtkStockItem stock;
+
+ if (gtk_image_get_storage_type (image) != GTK_IMAGE_STOCK)
+ return FALSE;
+
+ gtk_stock_lookup (image->data.stock.stock_id, &stock);
+
+ dbusmenu_menuitem_property_set (menuitem,
+ DBUSMENU_MENUITEM_PROP_ICON,
+ image->data.stock.stock_id);
+
+ if (stock.label != NULL)
+ {
+ dbusmenu_menuitem_property_set (menuitem,
+ DBUSMENU_MENUITEM_PROP_LABEL,
+ stock.label);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+image_notify_cb (GtkWidget *widget,
+ GParamSpec *pspec,
+ gpointer data)
+{
+ DbusmenuMenuitem *child = (DbusmenuMenuitem *)data;
+ GtkImage *image = GTK_IMAGE (widget);
+
+ if (pspec->name == g_intern_static_string ("stock"))
+ {
+ update_stock_item (child, image);
+ }
+ else if (pspec->name == g_intern_static_string ("icon-name"))
+ {
+ update_icon_name (child, image);
+ }
+}
+
+static void
widget_notify_cb (GtkWidget *widget,
GParamSpec *pspec,
gpointer data)
@@ -811,25 +869,24 @@ container_iterate (GtkWidget *widget,
}
else if (GTK_IS_IMAGE_MENU_ITEM (widget))
{
- GtkWidget *image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (widget));
-
- if (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_STOCK)
- {
- GtkStockItem stock;
+ GtkWidget *image;
+ GtkImageType image_type;
- gtk_stock_lookup (GTK_IMAGE (image)->data.stock.stock_id, &stock);
+ image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (widget));
+ image_type = gtk_image_get_storage_type (GTK_IMAGE (image));
- dbusmenu_menuitem_property_set (child,
- DBUSMENU_MENUITEM_PROP_ICON,
- GTK_IMAGE (image)->data.stock.stock_id);
+ g_signal_connect (image,
+ "notify",
+ G_CALLBACK (image_notify_cb),
+ child);
- if (stock.label != NULL)
- {
- dbusmenu_menuitem_property_set (child,
- DBUSMENU_MENUITEM_PROP_LABEL,
- stock.label);
- label_set = TRUE;
- }
+ if (image_type == GTK_IMAGE_STOCK)
+ {
+ label_set = update_stock_item (child, GTK_IMAGE (image));
+ }
+ else if (image_type == GTK_IMAGE_ICON_NAME)
+ {
+ update_icon_name (child, GTK_IMAGE (image));
}
}
}