diff options
| author | Ted Gould <ted@canonical.com> | 2009-11-06 16:47:54 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-11-06 16:47:54 -0600 |
| commit | 53f654eec6419c4999a620f9f1e0aaf3f2ac5e89 (patch) | |
| tree | bc1d11a794427a1cb5310fa4e0c6c8c9b8200f2b | |
| parent | 3ea189ef44422c02eacfb25089968acaaff61ab1 (diff) | |
| download | ayatana-indicator-application-53f654eec6419c4999a620f9f1e0aaf3f2ac5e89.tar.gz ayatana-indicator-application-53f654eec6419c4999a620f9f1e0aaf3f2ac5e89.tar.bz2 ayatana-indicator-application-53f654eec6419c4999a620f9f1e0aaf3f2ac5e89.zip | |
Adding in a set of marshallers to make our signals all happy.
| -rw-r--r-- | .bzrignore | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/custom-service-appstore.c | 3 | ||||
| -rw-r--r-- | src/custom-service-marshal.list | 1 |
4 files changed, 12 insertions, 1 deletions
@@ -26,3 +26,6 @@ tests/libcustomindicator-tests tests/test-libcustomindicator-dbus src/custom-service-client.h src/custom-service-server.h +src/custom-service-marshal.c +src/custom-service-marshal.h +src/stamp-marshal diff --git a/src/Makefile.am b/src/Makefile.am index 273c2dc..2fb861c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ BUILT_SOURCES = EXTRA_DIST = include $(top_srcdir)/Makefile.am.enum +include $(top_srcdir)/Makefile.am.marshal ################################## # Indicator @@ -33,6 +34,8 @@ indicator_custom_service_SOURCES = \ custom-service.c \ custom-service-appstore.h \ custom-service-appstore.c \ + custom-service-marshal.h \ + custom-service-marshal.c \ custom-service-server.h \ dbus-shared.h \ notification-item-client.h \ @@ -43,6 +46,9 @@ indicator_custom_service_CFLAGS = \ indicator_custom_service_LDADD = \ $(INDICATOR_LIBS) +glib_marshal_list = custom-service-marshal.list +glib_marshal_prefix = _custom_service_marshal + ################################## # Library ################################## diff --git a/src/custom-service-appstore.c b/src/custom-service-appstore.c index a012fae..02d7927 100644 --- a/src/custom-service-appstore.c +++ b/src/custom-service-appstore.c @@ -4,6 +4,7 @@ #include <dbus/dbus-glib.h> #include "custom-service-appstore.h" +#include "custom-service-marshal.h" #include "dbus-shared.h" /* DBus Prototypes */ @@ -59,7 +60,7 @@ custom_service_appstore_class_init (CustomServiceAppstoreClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CustomServiceAppstore, application_added), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + _custom_service_marshal_VOID__STRING_INT_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE); signals[APPLICATION_REMOVED] = g_signal_new ("application-removed", G_TYPE_FROM_CLASS(klass), diff --git a/src/custom-service-marshal.list b/src/custom-service-marshal.list new file mode 100644 index 0000000..4056f53 --- /dev/null +++ b/src/custom-service-marshal.list @@ -0,0 +1 @@ +VOID: STRING, INT, STRING, STRING |