telepathy-mission-control: Flatten McdPlugin into McdMaster
Simon McVittie
smcv at kemper.freedesktop.org
Thu May 10 08:15:18 PDT 2012
Module: telepathy-mission-control
Branch: master
Commit: 15d14bf15c3619a9d4ffa3adc5c80a2c6177d543
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=15d14bf15c3619a9d4ffa3adc5c80a2c6177d543
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue May 8 14:35:17 2012 +0100
Flatten McdPlugin into McdMaster
This older plugin API exposes enough MC internals that there's no point
trying to support it out-of-tree.
---
src/Makefile.am | 1 -
src/kludge-transport.c | 7 ++---
src/kludge-transport.h | 5 +--
src/mcd-connection-plugin.h | 8 -------
src/mcd-master.c | 17 +++++++--------
src/mcd-master.h | 12 +++++++++++
src/mcd-plugin.h | 45 -------------------------------------------
7 files changed, 25 insertions(+), 70 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b8efa9..eb26b23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,6 @@ mc_headers = \
mcd-connection.h \
mcd-connection-plugin.h \
mcd-connection-service-points.h \
- mcd-plugin.h \
mcd-channel.h \
mcd-proxy.h \
mcd-dispatcher.h \
diff --git a/src/kludge-transport.c b/src/kludge-transport.c
index 636f9cf..4baf33c 100644
--- a/src/kludge-transport.c
+++ b/src/kludge-transport.c
@@ -267,13 +267,12 @@ mcd_kludge_transport_new (void)
}
void
-mcd_kludge_transport_install (
- McdPlugin *plugin)
+mcd_kludge_transport_install (McdMaster *master)
{
McdTransportPlugin *self = mcd_kludge_transport_new ();
- mcd_plugin_register_transport (plugin, self);
- mcd_plugin_register_account_connection (plugin,
+ mcd_master_register_transport (master, self);
+ mcd_master_register_account_connection (master,
mcd_kludge_transport_account_connection_cb,
MCD_ACCOUNT_CONNECTION_PRIORITY_TRANSPORT, self);
}
diff --git a/src/kludge-transport.h b/src/kludge-transport.h
index b52d3a7..7f27043 100644
--- a/src/kludge-transport.h
+++ b/src/kludge-transport.h
@@ -21,7 +21,7 @@
#define MCD_KLUDGE_TRANSPORT_H
#include <glib-object.h>
-#include "mcd-plugin.h"
+#include "mcd-master.h"
#include "mcd-transport.h"
typedef struct _McdKludgeTransport McdKludgeTransport;
@@ -40,8 +40,7 @@ struct _McdKludgeTransport {
GType mcd_kludge_transport_get_type (void);
-void mcd_kludge_transport_install (
- McdPlugin *plugin);
+void mcd_kludge_transport_install (McdMaster *master);
/* TYPE MACROS */
#define MCD_TYPE_KLUDGE_TRANSPORT \
diff --git a/src/mcd-connection-plugin.h b/src/mcd-connection-plugin.h
index 748d939..cf41d7e 100644
--- a/src/mcd-connection-plugin.h
+++ b/src/mcd-connection-plugin.h
@@ -28,15 +28,12 @@
#include <glib.h>
#include <glib-object.h>
-#include "mcd-plugin.h"
#include "mcd-transport.h"
#include <telepathy-glib/enums.h>
G_BEGIN_DECLS
-typedef void (*McdAccountConnectionFunc) (McdAccount *account, GHashTable *parameters, gpointer userdata);
-
void mcd_account_connection_proceed (McdAccount *account, gboolean success);
void mcd_account_connection_proceed_with_reason
(McdAccount *account, gboolean success, TpConnectionStatusReason reason);
@@ -48,11 +45,6 @@ gboolean mcd_account_connection_is_user_initiated (McdAccount *account);
#define MCD_ACCOUNT_CONNECTION_PRIORITY_TRANSPORT 20000
#define MCD_ACCOUNT_CONNECTION_PRIORITY_PARAMS 30000
-void mcd_plugin_register_account_connection (McdPlugin *plugin,
- McdAccountConnectionFunc func,
- gint priority,
- gpointer userdata);
-
G_END_DECLS
#endif /* __MCD_CONNECTION_PLUGIN_H__ */
diff --git a/src/mcd-master.c b/src/mcd-master.c
index dab8da6..1f56db2 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -75,7 +75,6 @@
#include "mcd-account-manager-priv.h"
#include "mcd-account-conditions.h"
#include "mcd-account-priv.h"
-#include "mcd-plugin.h"
#include "mcd-transport.h"
#include "plugin-loader.h"
@@ -398,7 +397,7 @@ mcd_master_constructor (GType type, guint n_params,
mcd_operation_take_mission (MCD_OPERATION (priv->proxy),
MCD_MISSION (priv->dispatcher));
- mcd_kludge_transport_install ((McdPlugin *) master);
+ mcd_kludge_transport_install (master);
/* we assume that at this point all transport plugins have been registered.
* We get the active transports and check whether some accounts should be
@@ -540,33 +539,33 @@ mcd_master_get_dbus_daemon (McdMaster *master)
/**
* mcd_plugin_register_transport:
- * @plugin: the #McdPlugin.
+ * @master: the #McdMaster.
* @transport_plugin: the #McdTransportPlugin.
*
* Registers @transport_plugin as a transport monitoring object.
- * The @plugin takes ownership of the transport (i.e., it doesn't increment its
+ * The @master takes ownership of the transport (i.e., it doesn't increment its
* reference count).
*/
void
-mcd_plugin_register_transport (McdPlugin *plugin,
+mcd_master_register_transport (McdMaster *master,
McdTransportPlugin *transport_plugin)
{
- McdMasterPrivate *priv = MCD_MASTER_PRIV (plugin);
+ McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
DEBUG ("called");
g_signal_connect (transport_plugin, "status-changed",
G_CALLBACK (on_transport_status_changed),
- MCD_MASTER (plugin));
+ master);
g_ptr_array_add (priv->transport_plugins, transport_plugin);
}
void
-mcd_plugin_register_account_connection (McdPlugin *plugin,
+mcd_master_register_account_connection (McdMaster *master,
McdAccountConnectionFunc func,
gint priority,
gpointer userdata)
{
- McdMasterPrivate *priv = MCD_MASTER_PRIV (plugin);
+ McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
McdAccountConnectionData *acd;
GList *list;
diff --git a/src/mcd-master.h b/src/mcd-master.h
index df94392..3a247bb 100644
--- a/src/mcd-master.h
+++ b/src/mcd-master.h
@@ -68,5 +68,17 @@ McdMaster *mcd_master_get_default (void);
TpDBusDaemon *mcd_master_get_dbus_daemon (McdMaster *master);
void mcd_master_shutdown (McdMaster *self, const gchar *reason);
+void mcd_master_register_transport (McdMaster *master,
+ McdTransportPlugin *transport_plugin);
+
+typedef void (*McdAccountConnectionFunc) (McdAccount *account,
+ GHashTable *parameters,
+ gpointer userdata);
+
+void mcd_master_register_account_connection (McdMaster *master,
+ McdAccountConnectionFunc func,
+ gint priority,
+ gpointer userdata);
+
G_END_DECLS
#endif /* MCD_MASTER_H */
diff --git a/src/mcd-plugin.h b/src/mcd-plugin.h
deleted file mode 100644
index c1c4076..0000000
--- a/src/mcd-plugin.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* vi: set et sw=4 ts=8 cino=t0,(0: */
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 8 -*- */
-/*
- * mcd-plugin.h - Loadable plugin support
- *
- * Copyright (C) 2008 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __MCD_PLUGIN_H__
-#define __MCD_PLUGIN_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef struct _McdPlugin McdPlugin;
-
-#include "mcd-dispatcher.h"
-#include "mcd-transport.h"
-
-typedef void (*McdPluginInitFunc) (McdPlugin *plugin);
-
-#define MCD_PLUGIN_INIT_FUNC "mcd_plugin_init"
-
-void mcd_plugin_register_transport (McdPlugin *plugin,
- McdTransportPlugin *transport_plugin);
-
-
-G_END_DECLS
-
-#endif
More information about the telepathy-commits
mailing list