aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-11-23 16:35:45 -0600
committerTed Gould <ted@canonical.com>2009-11-23 16:35:45 -0600
commit25d690a42cb12ca9136932d7ace759bbe4185f86 (patch)
tree24e233ce94e9fcfcc62d54bd38d2de213fd4a735
parent009e468befbd97cf69263b47a01bc66d9a119d66 (diff)
downloadlibayatana-appindicator-25d690a42cb12ca9136932d7ace759bbe4185f86.tar.gz
libayatana-appindicator-25d690a42cb12ca9136932d7ace759bbe4185f86.tar.bz2
libayatana-appindicator-25d690a42cb12ca9136932d7ace759bbe4185f86.zip
Registering marshallers for DBus in the indicator.
-rw-r--r--src/Makefile.am1
-rw-r--r--src/indicator-custom.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 21d7cf8..102804e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ include $(top_srcdir)/Makefile.am.marshal
customlibdir = $(INDICATORDIR)
customlib_LTLIBRARIES = libcustom.la
libcustom_la_SOURCES = \
+ custom-service-marshal.c \
dbus-shared.h \
indicator-custom.c
libcustom_la_CFLAGS = $(INDICATOR_CFLAGS) \
diff --git a/src/indicator-custom.c b/src/indicator-custom.c
index 3bd2aa9..53e2269 100644
--- a/src/indicator-custom.c
+++ b/src/indicator-custom.c
@@ -16,6 +16,7 @@
/* Local Stuff */
#include "dbus-shared.h"
#include "custom-service-client.h"
+#include "custom-service-marshal.h"
#define INDICATOR_CUSTOM_TYPE (indicator_custom_get_type ())
#define INDICATOR_CUSTOM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_CUSTOM_TYPE, IndicatorCustom))
@@ -87,6 +88,10 @@ indicator_custom_class_init (IndicatorCustomClass *klass)
io_class->get_entries = get_entries;
+ /* Register the marshallers for the dbus signals */
+ dbus_g_object_register_marshaller(g_cclosure_marshal_VOID__INT, G_TYPE_INT, G_TYPE_INVALID);
+ dbus_g_object_register_marshaller(_custom_service_marshal_VOID__STRING_INT_STRING_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+
return;
}
@@ -184,6 +189,7 @@ connected (IndicatorServiceManager * sm, gboolean connected, IndicatorCustom * c
G_TYPE_INT,
G_TYPE_NONE);
+ /* Connect to them */
dbus_g_proxy_connect_signal(priv->service_proxy,
"ApplicationAdded",
G_CALLBACK(application_added),