1.1 --- a/gmyth-upnp/src/gmyth_upnp.c	Mon Mar 03 13:12:42 2008 +0000
     1.2 +++ b/gmyth-upnp/src/gmyth_upnp.c	Mon Mar 03 13:50:41 2008 +0000
     1.3 @@ -62,7 +62,6 @@
     1.4  
     1.5  struct _GMythUPnPPrivate {
     1.6      GHashTable     *servers;
     1.7 -    GMythUPnPDeviceStatus last_status;
     1.8      gboolean        upnp_dev_found;
     1.9      gchar          *udn;
    1.10      GMutex         *mutex;

     2.1 --- a/gmyth-upnp/src/gmyth_upnp.h	Mon Mar 03 13:12:42 2008 +0000
     2.2 +++ b/gmyth-upnp/src/gmyth_upnp.h	Mon Mar 03 13:50:41 2008 +0000
     2.3 @@ -32,40 +32,16 @@
     2.4  #include <glib.h>
     2.5  #include <glib-object.h>
     2.6  
     2.7 -#include <stdlib.h>
     2.8 -#include <stdio.h>
     2.9 -#include <string.h>
    2.10 +G_BEGIN_DECLS
    2.11 +#define GMYTH_UPNP_TYPE                 (gmyth_upnp_get_type ())
    2.12 +#define GMYTH_UPNP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE, GMythUPnP))
    2.13 +#define GMYTH_UPNP_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE, GMythUPnPClass))
    2.14 +#define IS_GMYTH_UPNP(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE))
    2.15 +#define IS_GMYTH_UPNP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE))
    2.16 +#define GMYTH_UPNP_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
    2.17  
    2.18 -#include <gmyth/gmyth_backendinfo.h>
    2.19 -
    2.20 -G_BEGIN_DECLS
    2.21 -#define GMYTH_UPNP_TYPE               (gmyth_upnp_get_type ())
    2.22 -#define GMYTH_UPNP(obj)          		 	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE, GMythUPnP))
    2.23 -#define GMYTH_UPNP_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE, GMythUPnPClass))
    2.24 -#define IS_GMYTH_UPNP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE))
    2.25 -#define IS_GMYTH_UPNP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE))
    2.26 -#define GMYTH_UPNP_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
    2.27  typedef struct _GMythUPnP GMythUPnP;
    2.28  typedef struct _GMythUPnPClass GMythUPnPClass;
    2.29 -typedef struct _GMythUPnPDevice GMythUPnPDevice;
    2.30 -
    2.31 -/****************************************
    2.32 -* Data Type
    2.33 -****************************************/
    2.34 -
    2.35 -typedef enum upnp_device_list_status {
    2.36 -    GMYTH_UPNP_DEVICE_ADDED = 0,
    2.37 -    GMYTH_UPNP_DEVICE_UPDATED,
    2.38 -    GMYTH_UPNP_DEVICE_REMOVED
    2.39 -} GMythUPnPDeviceStatus;
    2.40 -
    2.41 -struct _GMythUPnPDevice {
    2.42 -    gchar  *uri;
    2.43 -    gchar  *host;
    2.44 -    gint   port;
    2.45 -    gchar  *protocol;
    2.46 -};
    2.47 -
    2.48  
    2.49  struct _GMythUPnPClass {
    2.50      GObjectClass    parent_class;

     3.1 --- a/gmyth-upnp/tests/main.c	Mon Mar 03 13:12:42 2008 +0000
     3.2 +++ b/gmyth-upnp/tests/main.c	Mon Mar 03 13:50:41 2008 +0000
     3.3 @@ -28,7 +28,7 @@
     3.4  
     3.5  
     3.6  #include <glib.h>
     3.7 -
     3.8 +#include <gmyth/gmyth.h>
     3.9  #include "gmyth_upnp.h"
    3.10  
    3.11  static void