diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-01-27 14:12:20 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 19:13:17 +0200 |
| commit | 84dd539f16e5e7539ba37086fdbd3edf1518a882 (patch) | |
| tree | 3af1a75118fb1dc7057fee21b7595f5b17ba3353 | |
| parent | cebec8bb99a01106e86575385c2031c0ad08bacd (diff) | |
ring-media-manager: clean away hysterical raisins
No more factory.
| -rw-r--r-- | src/ring-media-manager.c | 4 | ||||
| -rw-r--r-- | src/ring-media-manager.h | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/ring-media-manager.c b/src/ring-media-manager.c index 2b7df39..948d4e7 100644 --- a/src/ring-media-manager.c +++ b/src/ring-media-manager.c @@ -171,8 +171,6 @@ struct _RingMediaManagerPrivate /* Hash by object path */ GHashTable *channels; - RingMediaChannel *conference; /* Special channel for conference */ - ModemCallService *call_service; ModemTones *tones; @@ -277,7 +275,7 @@ ring_media_manager_set_property(GObject *object, switch (property_id) { case PROP_CONNECTION: /* We don't ref the connection, because it owns a reference to the - * factory, and it guarantees that the factory's lifetime is + * manager, and it guarantees that the manager's lifetime is * less than its lifetime */ priv->connection = g_value_get_object(value); break; diff --git a/src/ring-media-manager.h b/src/ring-media-manager.h index 2b1b5fd..7ec00e7 100644 --- a/src/ring-media-manager.h +++ b/src/ring-media-manager.h @@ -22,16 +22,15 @@ #ifndef RING_MEDIA_MANAGER_H #define RING_MEDIA_MANAGER_H -#include <telepathy-glib/channel-factory-iface.h> - G_BEGIN_DECLS -typedef struct _RingMediaFactory RingMediaManager; -typedef struct _RingMediaFactoryClass RingMediaManagerClass; +typedef struct _RingMediaManager RingMediaManager; +typedef struct _RingMediaManagerClass RingMediaManagerClass; typedef struct _RingMediaManagerPrivate RingMediaManagerPrivate; G_END_DECLS +#include <telepathy-glib/channel-manager.h> #include <ring-media-channel.h> #include <ring-emergency-service.h> #include <ring-util.h> @@ -39,11 +38,11 @@ G_END_DECLS G_BEGIN_DECLS -struct _RingMediaFactoryClass { +struct _RingMediaManagerClass { GObjectClass parent_class; }; -struct _RingMediaFactory { +struct _RingMediaManager { GObject parent; RingMediaManagerPrivate *priv; }; |