diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2008-06-21 19:44:25 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-06-24 00:23:33 +0200 |
| commit | c7f3feb3e6173a58bd7426382e4bd4fc13f05911 (patch) | |
| tree | 7df051f19ae72c10e1eb46e8c021f9c9bcadd354 /avahi-gobject | |
| parent | ff96a35f43eceb5ddf031b9730cbcd9b2aa8c16e (diff) | |
put custom marshallers in the _ga_ namespace instead of ga_
Diffstat (limited to 'avahi-gobject')
| -rw-r--r-- | avahi-gobject/Makefile.am | 6 | ||||
| -rw-r--r-- | avahi-gobject/ga-record-browser.c | 4 | ||||
| -rw-r--r-- | avahi-gobject/ga-service-browser.c | 4 | ||||
| -rw-r--r-- | avahi-gobject/ga-service-resolver.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/avahi-gobject/Makefile.am b/avahi-gobject/Makefile.am index a9bcd4b..6654669 100644 --- a/avahi-gobject/Makefile.am +++ b/avahi-gobject/Makefile.am @@ -75,7 +75,7 @@ dist-hook: signals-marshal.list: $(CORE_SOURCES) Makefile.am ( cd $(srcdir) && \ - sed -n -e 's/.*ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \ + sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \ $(CORE_SOURCES) ) \ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp if cmp -s $@.tmp $@; then \ @@ -85,10 +85,10 @@ signals-marshal.list: $(CORE_SOURCES) Makefile.am fi signals-marshal.h: signals-marshal.list - glib-genmarshal --header --prefix=ga_signals_marshal $< > $@ + glib-genmarshal --header --prefix=_ga_signals_marshal $< > $@ signals-marshal.c: signals-marshal.list - glib-genmarshal --body --prefix=ga_signals_marshal $< > $@ + glib-genmarshal --body --prefix=_ga_signals_marshal $< > $@ # rules for making the glib enum objects diff --git a/avahi-gobject/ga-record-browser.c b/avahi-gobject/ga-record-browser.c index ef7641d..f310506 100644 --- a/avahi-gobject/ga-record-browser.c +++ b/avahi-gobject/ga-record-browser.c @@ -162,7 +162,7 @@ static void ga_record_browser_class_init(GaRecordBrowserClass * ga_record_browse G_SIGNAL_RUN_LAST, 0, NULL, NULL, - ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT, + _ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT, G_TYPE_NONE, 8, G_TYPE_INT, GA_TYPE_PROTOCOL, @@ -178,7 +178,7 @@ static void ga_record_browser_class_init(GaRecordBrowserClass * ga_record_browse G_SIGNAL_RUN_LAST, 0, NULL, NULL, - ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT, + _ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT, G_TYPE_NONE, 8, G_TYPE_INT, GA_TYPE_PROTOCOL, diff --git a/avahi-gobject/ga-service-browser.c b/avahi-gobject/ga-service-browser.c index 632a7d5..abd03cd 100644 --- a/avahi-gobject/ga-service-browser.c +++ b/avahi-gobject/ga-service-browser.c @@ -164,7 +164,7 @@ static void ga_service_browser_class_init(GaServiceBrowserClass * G_SIGNAL_RUN_LAST, 0, NULL, NULL, - ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT, + _ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT, G_TYPE_NONE, 6, G_TYPE_INT, GA_TYPE_PROTOCOL, @@ -178,7 +178,7 @@ static void ga_service_browser_class_init(GaServiceBrowserClass * G_SIGNAL_RUN_LAST, 0, NULL, NULL, - ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT, + _ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT, G_TYPE_NONE, 6, G_TYPE_INT, GA_TYPE_PROTOCOL, diff --git a/avahi-gobject/ga-service-resolver.c b/avahi-gobject/ga-service-resolver.c index d3fa4d9..d3cfaa0 100644 --- a/avahi-gobject/ga-service-resolver.c +++ b/avahi-gobject/ga-service-resolver.c @@ -183,7 +183,7 @@ static void ga_service_resolver_class_init(GaServiceResolverClass * G_SIGNAL_RUN_LAST, 0, NULL, NULL, - ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_STRING_POINTER_INT_POINTER_INT, + _ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_STRING_POINTER_INT_POINTER_INT, G_TYPE_NONE, 10, G_TYPE_INT, GA_TYPE_PROTOCOL, |