summaryrefslogtreecommitdiffstats
path: root/avahi-daemon/dbus-protocol.c
diff options
context:
space:
mode:
authorTrent Lloyd <lathiat@bur.st>2005-06-17 13:43:17 +0000
committerTrent Lloyd <lathiat@bur.st>2005-06-17 13:43:17 +0000
commit514a726560b8e8582abff7ccbc6e69ade5cdb04a (patch)
tree0852bafc1c49b6302141c12bbe9b78965491bbe6 /avahi-daemon/dbus-protocol.c
parent3a1dbb2f9ed114446ce39eb9c63d213a33771b51 (diff)
* more dbus build fixes
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@121 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon/dbus-protocol.c')
-rw-r--r--avahi-daemon/dbus-protocol.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index aede620..5017061 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -109,7 +109,7 @@ signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
}
int
-dbus_protocol_setup ()
+dbus_protocol_setup (GMainLoop *loop)
{
DBusError error;
@@ -122,7 +122,7 @@ dbus_protocol_setup ()
g_warning ("dbus_bus_get(): %s", error.message);
dbus_error_free (&error);
- goto finish;
+ return 1;
}
dbus_connection_setup_with_g_main (bus, NULL);
@@ -135,7 +135,7 @@ dbus_protocol_setup ()
g_warning ("dbus_error_is_set (): %s", error.message);
dbus_error_free (&error);
- goto finish;
+ return 1;
}
dbus_connection_add_filter (bus, signal_filter, loop, NULL);
@@ -148,8 +148,10 @@ dbus_protocol_setup ()
g_warning ("dbus_bus_add_match (): %s", error.message);
dbus_error_free (&error);
- goto finish;
+ return 1;
}
+
+ return 0;
}
void