From a417c80df67fd640a6f66fc4ef08c7f7ddc4bccd Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Tue, 23 Aug 2005 19:31:53 +0000 Subject: * Merge changes from trunk into netlink-abstraction git-svn-id: file:///home/lennart/svn/public/avahi/branches/netlink-abstraction@428 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/Makefile.am | 2 +- avahi-client/browser.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'avahi-client') diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am index 1229862..cdc4442 100644 --- a/avahi-client/Makefile.am +++ b/avahi-client/Makefile.am @@ -41,7 +41,7 @@ libavahi_client_la_SOURCES = \ libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common-pic.la -libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0 +libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 1:0:1 client_test_SOURCES = client-test.c client_test_CFLAGS = $(AM_CFLAGS) diff --git a/avahi-client/browser.c b/avahi-client/browser.c index 5de4824..9a7438e 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -573,6 +573,9 @@ DBusHandlerResult avahi_service_browser_event (AvahiClient *client, AvahiBrowser if (strcmp (b->path, path) == 0) break; + if (!b) + goto fail; + if (!dbus_message_get_args ( message, &error, DBUS_TYPE_INT32, &interface, -- cgit