diff options
| author | Ted Gould <ted@canonical.com> | 2009-08-04 10:27:08 +0100 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-08-04 10:27:08 +0100 |
| commit | 5909ee4172e2913f7ef65b4632c4a283431adae4 (patch) | |
| tree | 977b8970244ec952fc55ddaf7a9cb9aec8e794e9 /libindicate/server.c | |
| parent | 064740bd411abe73a67a9c75f469f04d8259afdb (diff) | |
| parent | 63ed0ba9f0de5d60f31e5c52849cb6fb7a070cd9 (diff) | |
| download | libayatana-indicator-5909ee4172e2913f7ef65b4632c4a283431adae4.tar.gz libayatana-indicator-5909ee4172e2913f7ef65b4632c4a283431adae4.tar.bz2 libayatana-indicator-5909ee4172e2913f7ef65b4632c4a283431adae4.zip | |
* Merging in upstream code to split out libindicate-gtk
* debian/control:
* Changing the version number of libindcate to 2 to match
the .so numbering.
* Creating packages for libindicate-gtk
* Added libindicate-gtk-dev.install and libindicate-gtk0.install
for the new library.
* Renamed libindicate1.install to libindicate2.install to match
the package name change.
* Modified libindicate-dev to be more specific about the header
files that it grabs.
Diffstat (limited to 'libindicate/server.c')
| -rw-r--r-- | libindicate/server.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libindicate/server.c b/libindicate/server.c index cd8b33a..a3d3be8 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -29,6 +29,7 @@ License version 3 and version 2.1 along with this program. If not, see #include "server.h" #include "interests-priv.h" +#include "server-marshal.h" #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> @@ -179,7 +180,7 @@ indicate_server_class_init (IndicateServerClass * class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicateServerClass, indicator_added), NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, + _indicate_server_marshal_VOID__UINT_STRING, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); /** IndicateServer::indicator-removed: @@ -197,7 +198,7 @@ indicate_server_class_init (IndicateServerClass * class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicateServerClass, indicator_removed), NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, + _indicate_server_marshal_VOID__UINT_STRING, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); /** IndicateServer::indicator-modified: @@ -215,7 +216,7 @@ indicate_server_class_init (IndicateServerClass * class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicateServerClass, indicator_modified), NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, + _indicate_server_marshal_VOID__UINT_STRING, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); /** IndicateServer::server-show: @@ -231,7 +232,7 @@ indicate_server_class_init (IndicateServerClass * class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicateServerClass, server_show), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); /** IndicateServer::server-hide: @@ -246,7 +247,7 @@ indicate_server_class_init (IndicateServerClass * class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicateServerClass, server_hide), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); /** IndicateServer::server-display: |