diff -r cb885ee44618 -r da7ce603d47f gmyth-upnp/src/gmyth_upnp.h
--- a/gmyth-upnp/src/gmyth_upnp.h	Thu Jun 14 20:40:47 2007 +0100
+++ b/gmyth-upnp/src/gmyth_upnp.h	Mon Feb 04 18:23:49 2008 +0000
@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <cybergarage/upnp/cupnp.h>
 #include <gmyth/gmyth_backendinfo.h>
 
 G_BEGIN_DECLS
@@ -47,7 +46,7 @@
 #define GMYTH_UPNP_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
 typedef struct _GMythUPnP GMythUPnP;
 typedef struct _GMythUPnPClass GMythUPnPClass;
-typedef struct _GMythUPnPPrivate GMythUPnPPrivate;
+typedef struct _GMythUPnPDevice GMythUPnPDevice;
 
 /****************************************
 * Data Type
@@ -59,59 +58,25 @@
     GMYTH_UPNP_DEVICE_REMOVED
 } GMythUPnPDeviceStatus;
 
-typedef void    (*GMythUPnPDeviceListener) (GMythUPnP * gmyth_upnp,
-                                            GMythUPnPDeviceStatus status,
-                                            gchar * dev);
+struct _GMythUPnPDevice {
+    gchar  *uri;
+    gchar  *host;
+    gint   port;
+    gchar  *protocol;
+};
+
 
 struct _GMythUPnPClass {
     GObjectClass    parent_class;
-
-    /*
-     * callbacks 
-     */
-    guint           device_found_handler_signal_id;
-
-    GMythUPnPDeviceListener device_found_handler;
-
-    /*
-     * no one for now 
-     */
 };
 
-struct _GMythUPnPDevice {
-    gchar          *uri;
-    gchar          *host;
-    gint            port;
-    gchar          *protocol;
+struct _GMythUPnP {
+    GObject         parent;
 };
 
-typedef struct _GMythUPnPDevice GMythUPnPDevice;
-
-struct _GMythUPnP {
-
-    GObject         parent;
-    GMythUPnPPrivate *priv;
-
-
-    CgUpnpControlPoint *control_point;
-
-    gchar          *udn;
-
-    GMythBackendInfo *backend_info;
-
-    gboolean        upnp_dev_found;
-};
-
-GType           gmyth_upnp_get_type(void);
-GMythUPnP      *gmyth_upnp_new(GMythBackendInfo * gmyth_backend_info,
-                               GMythUPnPDeviceListener handler);
-
-GList          *gmyth_upnp_do_search_sync(GMythUPnP * gmyth_upnp);
-
-GMythBackendInfo *gmyth_upnp_get_backend_info(GMythUPnP * gmyth_upnp);
-
-gchar          *gmyth_upnp_device_status_to_string(GMythUPnPDeviceStatus
-                                                   status);
+GType               gmyth_upnp_get_type         (void);
+GMythUPnP*          gmyth_upnp_get_instance     (void);
+void                gmyth_upnp_search           (GMythUPnP * gmyth_upnp);
 
 G_END_DECLS
 #endif                          /* _GMYTH_UPNP_H_ */