From c8faaf3f5490dc8b516b6944432d1de8f05248cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 11:23:21 -0600 Subject: Fixing Marshallers so that everything is happy-happy. --- src/indicator-custom.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/indicator-custom.c') diff --git a/src/indicator-custom.c b/src/indicator-custom.c index 964d8aa..56f1032 100644 --- a/src/indicator-custom.c +++ b/src/indicator-custom.c @@ -88,6 +88,14 @@ indicator_custom_class_init (IndicatorCustomClass *klass) io_class->get_entries = get_entries; + dbus_g_object_register_marshaller(_custom_service_marshal_VOID__STRING_INT_STRING_STRING, + G_TYPE_NONE, + G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INVALID); + return; } @@ -180,11 +188,11 @@ connected (IndicatorServiceManager * sm, gboolean connected, IndicatorCustom * c G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_NONE); + G_TYPE_INVALID); dbus_g_proxy_add_signal(priv->service_proxy, "ApplicationRemoved", G_TYPE_INT, - G_TYPE_NONE); + G_TYPE_INVALID); /* Connect to them */ g_debug("Connect to them."); -- cgit v1.2.3 From ce09817718cd7fd41b55c3ec1476f7ebe8834b46 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 14:06:05 -0600 Subject: Showing the icon. Now we can put things up in the menu! Finally. --- src/indicator-custom.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/indicator-custom.c') diff --git a/src/indicator-custom.c b/src/indicator-custom.c index 56f1032..da89c30 100644 --- a/src/indicator-custom.c +++ b/src/indicator-custom.c @@ -246,6 +246,7 @@ get_entries (IndicatorObject * io) static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, IndicatorCustom * custom) { + g_debug("Building new application entry: %s with icon: %s", dbusaddress, iconname); IndicatorCustomPrivate * priv = INDICATOR_CUSTOM_GET_PRIVATE(custom); ApplicationEntry * app = g_new(ApplicationEntry, 1); @@ -253,6 +254,8 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co app->entry.label = NULL; app->entry.menu = GTK_MENU(dbusmenu_gtkmenu_new((gchar *)dbusaddress, (gchar *)dbusobject)); + gtk_widget_show(GTK_WIDGET(app->entry.image)); + priv->applications = g_list_insert(priv->applications, app, position); /* TODO: Need to deal with position here somehow */ -- cgit v1.2.3