[libdmapsharing] Fixes related to porting Rhythmbox to API 3 Signed-off-by: W. Michael Petullo <mike flyn org>

[W. Michael Petullo <wmpetullo src gnome org>]

commit 1699767e8512af9faac7f4183180337ef8e94f3f
Author: W. Michael Petullo <mike flyn org>
Date:   Tue Jan 18 20:05:10 2011 -0600

    Fixes related to porting Rhythmbox to API 3
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/dmap-connection.c         |   22 ----------------------
 libdmapsharing/dmap-connection.h         |    7 -------
 libdmapsharing/dmap-mdns-browser-avahi.c |   11 ++++++-----
 libdmapsharing/dmap.h                    |    2 ++
 4 files changed, 8 insertions(+), 34 deletions(-)
---
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index 13c9928..751cc0f 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -1125,28 +1125,6 @@ handle_logout (DMAPConnection *connection,
 	dmap_connection_state_done (connection, TRUE);
 }
 
-DMAPConnection *
-dmap_connection_new (const char        *name,
-		     const char        *host,
-		     guint              port,
-		     gboolean           password_protected,
-		     DMAPDb            *db,
-		     DMAPRecordFactory *factory)
-{
-	DMAPConnection *connection;
-	
-	connection = g_object_new (DMAP_TYPE_CONNECTION,
-			          "name", name,
-			          "password-protected", password_protected,
-			          "db", db,
-			          "host", host,
-			          "port", port,
-				  "factory", factory,
-			           NULL);
-
-	return connection;
-}
-
 gboolean
 dmap_connection_is_connected (DMAPConnection *connection)
 {
diff --git a/libdmapsharing/dmap-connection.h b/libdmapsharing/dmap-connection.h
index 740a90d..c628fc0 100644
--- a/libdmapsharing/dmap-connection.h
+++ b/libdmapsharing/dmap-connection.h
@@ -146,13 +146,6 @@ typedef void (* DMAPResponseHandler) (DMAPConnection *connection,
 
 GType              dmap_connection_get_type        (void);
 
-DMAPConnection * dmap_connection_new             (const char              *name,
-						  const char              *host,
-						  guint                    port,
-						  gboolean                 password_protected,
-						  DMAPDb		  *db,
-						  DMAPRecordFactory *factory);
-
 gboolean           dmap_connection_is_connected    (DMAPConnection        *connection);
 void               dmap_connection_setup           (DMAPConnection        *connection);
 void               dmap_connection_connect         (DMAPConnection        *connection,
diff --git a/libdmapsharing/dmap-mdns-browser-avahi.c b/libdmapsharing/dmap-mdns-browser-avahi.c
index 135faf1..9facdb9 100644
--- a/libdmapsharing/dmap-mdns-browser-avahi.c
+++ b/libdmapsharing/dmap-mdns-browser-avahi.c
@@ -371,12 +371,13 @@ resolve_cb (AvahiServiceResolver *service_resolver,
 #endif
             DMAPMdnsBrowser *browser)
 {
+    gchar *name = NULL;
+    gchar *pair = NULL; /* FIXME: extract DACP-specific items into sub-class? See also howl code. */
+    gchar host[AVAHI_ADDRESS_STR_MAX];
+    gboolean pp = FALSE;
+    DMAPMdnsBrowserService *service;
+
     switch (event) {
-        gchar *name = NULL;
-        gchar *pair = NULL; /* FIXME: extract DACP-specific items into sub-class? See also howl code. */
-        gchar host[AVAHI_ADDRESS_STR_MAX];
-        gboolean pp = FALSE;
-        DMAPMdnsBrowserService *service;
     case AVAHI_RESOLVER_FAILURE:
 	g_warning ("Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", service_name, type, domain, avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(service_resolver))));
 	break;
diff --git a/libdmapsharing/dmap.h b/libdmapsharing/dmap.h
index 3f794d4..fdbba22 100644
--- a/libdmapsharing/dmap.h
+++ b/libdmapsharing/dmap.h
@@ -1,6 +1,7 @@
 #ifndef __DMAP_H
 #define __DMAP_H
 
+#include <libdmapsharing/daap-connection.h>
 #include <libdmapsharing/daap-record.h>
 #include <libdmapsharing/daap-share.h>
 #include <libdmapsharing/dmap-connection.h>
@@ -14,6 +15,7 @@
 #include <libdmapsharing/dmap-record.h>
 #include <libdmapsharing/dmap-record-factory.h>
 #include <libdmapsharing/dmap-share.h>
+#include <libdmapsharing/dpap-connection.h>
 #include <libdmapsharing/dpap-record.h>
 #include <libdmapsharing/dpap-share.h>
 #include <libdmapsharing/dacp-share.h>