telepathy-mission-control: mcd_manager_create_connection: don't be virtual, no subclass exists

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 46b86f8fd7584c5f8dbfc247fea25d32c27d4733
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=46b86f8fd7584c5f8dbfc247fea25d32c27d4733

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue May  8 14:26:36 2012 +0100

mcd_manager_create_connection: don't be virtual, no subclass exists

---

 src/mcd-manager.c |   26 ++++++++------------------
 src/mcd-manager.h |    2 --
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/mcd-manager.c b/src/mcd-manager.c
index b6f8915..5c0e9fb 100644
--- a/src/mcd-manager.c
+++ b/src/mcd-manager.c
@@ -259,20 +259,6 @@ _mcd_manager_get_property (GObject * obj, guint prop_id,
     }
 }
 
-static McdConnection *
-create_connection (McdManager *manager, McdAccount *account)
-{
-    McdManagerPrivate *priv = manager->priv;
-
-    return g_object_new (MCD_TYPE_CONNECTION,
-                         "dbus-daemon", priv->dbus_daemon,
-                         "tp-manager", priv->tp_conn_mgr,
-                         "dispatcher", priv->dispatcher,
-                         "account", account,
-                         "slacker", priv->slacker,
-                         NULL);
-}
-
 static void
 mcd_manager_class_init (McdManagerClass * klass)
 {
@@ -290,8 +276,6 @@ mcd_manager_class_init (McdManagerClass * klass)
     mission_class->connect = _mcd_manager_connect;
     mission_class->disconnect = _mcd_manager_disconnect;
 
-    klass->create_connection = create_connection;
-
     /* Properties */
     g_object_class_install_property
         (object_class, PROP_NAME,
@@ -401,8 +385,14 @@ mcd_manager_create_connection (McdManager *manager, McdAccount *account)
     g_return_val_if_fail (MCD_IS_MANAGER (manager), NULL);
     g_return_val_if_fail (manager->priv->tp_conn_mgr != NULL, NULL);
 
-    connection = MCD_MANAGER_GET_CLASS (manager)->create_connection
-        (manager, account);
+    connection = g_object_new (MCD_TYPE_CONNECTION,
+                               "dbus-daemon", manager->priv->dbus_daemon,
+                               "tp-manager", manager->priv->tp_conn_mgr,
+                               "dispatcher", manager->priv->dispatcher,
+                               "account", account,
+                               "slacker", manager->priv->slacker,
+                               NULL);
+
     mcd_operation_take_mission (MCD_OPERATION (manager),
 				MCD_MISSION (connection));
     DEBUG ("Created a connection %p for account: %s",
diff --git a/src/mcd-manager.h b/src/mcd-manager.h
index a9b015e..d02c006 100644
--- a/src/mcd-manager.h
+++ b/src/mcd-manager.h
@@ -57,8 +57,6 @@ struct _McdManager
 struct _McdManagerClass
 {
     McdOperationClass parent_class;
-    McdConnection *(*create_connection) (McdManager *manager,
-                                         McdAccount *account);
     void (*_mc_reserved1) (void);
     void (*_mc_reserved2) (void);
     void (*_mc_reserved3) (void);