From 004770625d33b0b106551c90f7e07e109180279f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Sep 2009 14:14:24 -0500 Subject: Using the defines fo dealing with the icons and using the generic image type. We're just passing along the PNGs right now. --- src/im-menu-item.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/im-menu-item.c') diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 008e33f..242c1c4 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -147,10 +147,9 @@ im_menu_item_finalize (GObject *object) } static void -icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GdkPixbuf * propertydata, gpointer data) +icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data) { - /* dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "icon", propertydata); */ - + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_DATA, propertydata); return; } @@ -280,7 +279,7 @@ indicator_modified_cb (IndicateListener * listener, IndicateListenerServer * ser } else if (!g_strcmp0(property, "time")) { indicate_listener_get_property_time(listener, server, indicator, "time", time_cb, self); } else if (!g_strcmp0(property, "icon")) { - indicate_listener_get_property_icon(listener, server, indicator, "icon", icon_cb, self); + indicate_listener_get_property(listener, server, indicator, "icon", icon_cb, self); } return; @@ -299,9 +298,11 @@ im_menu_item_new (IndicateListener * listener, IndicateListenerServer * server, priv->show_time = show_time; priv->time_update_min = 0; + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_IMAGE); + indicate_listener_get_property(listener, server, indicator, "sender", sender_cb, self); indicate_listener_get_property_time(listener, server, indicator, "time", time_cb, self); - indicate_listener_get_property_icon(listener, server, indicator, "icon", icon_cb, self); + indicate_listener_get_property(listener, server, indicator, "icon", icon_cb, self); g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL); priv->indicator_changed = g_signal_connect(G_OBJECT(listener), INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED, G_CALLBACK(indicator_modified_cb), self); -- cgit v1.2.3 From 51e1ef970beb33b529fe339abcfafa1ff99c8a83 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 4 Sep 2009 08:58:43 -0500 Subject: Fixing a header and some defines. --- src/im-menu-item.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/im-menu-item.c') diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 242c1c4..0b8ef8f 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -24,6 +24,7 @@ with this program. If not, see . #endif #include +#include #include #include #include "im-menu-item.h" @@ -298,7 +299,7 @@ im_menu_item_new (IndicateListener * listener, IndicateListenerServer * server, priv->show_time = show_time; priv->time_update_min = 0; - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_IMAGE); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", DBUSMENU_CLIENT_TYPES_IMAGE); indicate_listener_get_property(listener, server, indicator, "sender", sender_cb, self); indicate_listener_get_property_time(listener, server, indicator, "time", time_cb, self); -- cgit v1.2.3 From a04a5e11668a7068f1307b28911df1097ab983cf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 4 Sep 2009 09:02:34 -0500 Subject: A variable and a prototype. Such is life. --- src/im-menu-item.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/im-menu-item.c') diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 0b8ef8f..6f58ebd 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -74,7 +74,7 @@ static void icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, - GdkPixbuf * propertydata, + gchar * propertydata, gpointer data); static void activate_cb (ImMenuItem * self, gpointer data); @@ -150,7 +150,7 @@ im_menu_item_finalize (GObject *object) static void icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data) { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_DATA, propertydata); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM_PROP_ICON_DATA, propertydata); return; } -- cgit v1.2.3