Index: libgnomevfs/gnome-vfs-dns-sd.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-dns-sd.c,v
retrieving revision 1.19
diff -u -r1.19 gnome-vfs-dns-sd.c
--- libgnomevfs/gnome-vfs-dns-sd.c	27 Feb 2006 10:32:22 -0000	1.19
+++ libgnomevfs/gnome-vfs-dns-sd.c	28 Feb 2006 21:44:01 -0000
@@ -1304,6 +1304,29 @@
 }
 
 #ifdef HAVE_AVAHI
+struct sync_resolve_data {
+	AvahiSimplePoll *poll;
+	AvahiIfIndex interface;
+	AvahiProtocol protocol;
+	gboolean got_data;
+	char *host;
+	int port;
+	char *text;
+	int text_len;
+};
+
+
+static void
+avahi_resolve_sync_client_callback (AvahiClient *c, AvahiClientState state, void *user_data)
+{
+	struct sync_resolve_data *data;
+
+	data = user_data;
+	if (state == AVAHI_CLIENT_FAILURE) {
+		avahi_simple_poll_quit (data->poll);
+	}
+}
+
 static void
 avahi_resolve_async_callback (AvahiServiceResolver *r,
 			      AvahiIfIndex interface,
@@ -1956,27 +1979,6 @@
 }
 
 #ifdef HAVE_AVAHI
-struct sync_resolve_data {
-	AvahiSimplePoll *poll;
-	gboolean got_data;
-	char *host;
-	int port;
-	char *text;
-	int text_len;
-};
-
-
-static void
-avahi_resolve_sync_client_callback (AvahiClient *c, AvahiClientState state, void *user_data)
-{
-	struct sync_resolve_data *data;
-
-	data = user_data;
-	if (state == AVAHI_CLIENT_FAILURE) {
-		avahi_simple_poll_quit (data->poll);
-	}
-}
-
 static void
 avahi_resolve_sync_callback (AvahiServiceResolver *r,
 			     AvahiIfIndex interface,
