From 86cab293762c8b864a58f3e297c057cc05794daf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 09:31:43 -0500 Subject: Checking args from libdbusmenu, stealing code from there. Comments by Neil. --- src/indicator-messages.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 0a1002d..c410ef7 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -140,6 +140,10 @@ setup_icon_proxy (gpointer userdata) static gboolean new_launcher_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); + g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); + /* Note: not checking parent, it's reasonable for it to be NULL */ + GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); GtkWidget * vbox = gtk_vbox_new(TRUE, 2); -- cgit v1.2.3 From 9490242a8ee3f624599668ff3cc77b4c7026ead3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 10:11:36 -0500 Subject: Changing to version 0.2.0. We need a release sometime. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d9962a0..ef2239b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.0dev) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.0) AM_MAINTAINER_MODE -- cgit v1.2.3 From 48c1827cd615f895720a71bff70e0401f4b52f17 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 13:58:13 -0500 Subject: Updating to dbusmenu 0.1.0 as a versioning snafu got involved. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ef2239b..8b9caca 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 INDICATE_REQUIRED_VERSION=0.2.0 INDICATOR_REQUIRED_VERSION=0.2.0 -DBUSMENUGTK_REQUIRED_VERSION=0.0.2 +DBUSMENUGTK_REQUIRED_VERSION=0.1.0 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION -- cgit v1.2.3 From 8f44a2f0e4c64839956a4238a4088baa54547ca3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Sep 2009 14:06:22 -0500 Subject: Upping dbusmenu version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8b9caca..a3d937b 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 INDICATE_REQUIRED_VERSION=0.2.0 INDICATOR_REQUIRED_VERSION=0.2.0 -DBUSMENUGTK_REQUIRED_VERSION=0.1.0 +DBUSMENUGTK_REQUIRED_VERSION=0.1.1 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION -- cgit v1.2.3 From 77ad7a72d9c7f1996d82cb32ce8f3887c87df6f2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Sep 2009 14:13:45 -0500 Subject: Using defines for visibility. --- src/messages-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/messages-service.c b/src/messages-service.c index 093ebfd..754021b 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -531,7 +531,7 @@ server_removed (IndicateListener * listener, IndicateListenerServer * server, gc serverList = g_list_remove(serverList, sltp); if (sltp->menuitem != NULL) { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), "visibile", "false"); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM(sltp->menuitem)); g_object_unref(G_OBJECT(sltp->menuitem)); } @@ -776,7 +776,7 @@ indicator_removed (IndicateListener * listener, IndicateListenerServer * server, g_signal_handler_disconnect(menuitem, ilt->timechange_cb); g_free(ilt); - dbusmenu_menuitem_property_set(menuitem, "visibile", "false"); + dbusmenu_menuitem_property_set(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), menuitem); removed = TRUE; } -- cgit v1.2.3 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(-) 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(-) 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(-) 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