From 372c759c3d665a376a521b33a8cdc94558d966de Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 26 Sep 2013 19:46:20 +0100 Subject: [PATCH 04/22] adjust for rename of TpSimpleClientFactory to TpClientFactory --- mission-control-plugins/dispatch-operation.c | 12 ++++++------ mission-control-plugins/dispatch-operation.h | 6 +++--- src/mcd-account-manager.c | 13 ++++++------- src/mcd-account-manager.h | 2 +- src/mcd-channel.c | 4 ++-- src/mcd-connection.c | 6 +++--- src/mcd-manager.c | 8 ++++---- src/mcd-manager.h | 2 +- src/mcd-master.c | 4 ++-- util/mc-tool.c | 10 +++++----- 10 files changed, 33 insertions(+), 34 deletions(-) diff --git a/mission-control-plugins/dispatch-operation.c b/mission-control-plugins/dispatch-operation.c index 1fced1a..da8a4de 100644 --- a/mission-control-plugins/dispatch-operation.c +++ b/mission-control-plugins/dispatch-operation.c @@ -361,7 +361,7 @@ mcp_dispatch_operation_destroy_channels (McpDispatchOperation *self, */ gboolean mcp_dispatch_operation_find_channel_by_type (McpDispatchOperation *self, - TpSimpleClientFactory *client_factory, + TpClientFactory *client_factory, guint start_from, TpHandleType handle_type, GQuark channel_type, @@ -411,7 +411,7 @@ mcp_dispatch_operation_find_channel_by_type (McpDispatchOperation *self, TpConnection *connection = mcp_dispatch_operation_ref_connection (self, client_factory); - *ret_ref_channel = tp_simple_client_factory_ensure_channel ( + *ret_ref_channel = tp_client_factory_ensure_channel ( client_factory, connection, channel_path, properties, NULL); g_object_unref (connection); @@ -439,7 +439,7 @@ mcp_dispatch_operation_find_channel_by_type (McpDispatchOperation *self, */ TpConnection * mcp_dispatch_operation_ref_connection (McpDispatchOperation *self, - TpSimpleClientFactory *client_factory) + TpClientFactory *client_factory) { const gchar *conn_path; @@ -449,7 +449,7 @@ mcp_dispatch_operation_ref_connection (McpDispatchOperation *self, if (conn_path != NULL) { - return tp_simple_client_factory_ensure_connection (client_factory, + return tp_client_factory_ensure_connection (client_factory, conn_path, NULL, NULL); } @@ -469,7 +469,7 @@ mcp_dispatch_operation_ref_connection (McpDispatchOperation *self, */ TpChannel * mcp_dispatch_operation_ref_nth_channel (McpDispatchOperation *self, - TpSimpleClientFactory *client_factory, + TpClientFactory *client_factory, guint n) { TpConnection *connection; @@ -495,7 +495,7 @@ mcp_dispatch_operation_ref_nth_channel (McpDispatchOperation *self, if (channel_properties == NULL) goto finally; - channel = tp_simple_client_factory_ensure_channel (client_factory, + channel = tp_client_factory_ensure_channel (client_factory, connection, channel_path, channel_properties, NULL); finally: diff --git a/mission-control-plugins/dispatch-operation.h b/mission-control-plugins/dispatch-operation.h index 889f5fd..f4c9ae6 100644 --- a/mission-control-plugins/dispatch-operation.h +++ b/mission-control-plugins/dispatch-operation.h @@ -53,15 +53,15 @@ GType mcp_dispatch_operation_get_type (void) G_GNUC_CONST; gboolean mcp_dispatch_operation_find_channel_by_type ( McpDispatchOperation *self, - TpSimpleClientFactory *client_factory, + TpClientFactory *client_factory, guint start_from, TpHandleType handle_type, GQuark channel_type, guint *ret_index, gchar **ret_dup_path, GHashTable **ret_ref_immutable_properties, TpChannel **ret_ref_channel); TpConnection *mcp_dispatch_operation_ref_connection ( - McpDispatchOperation *self, TpSimpleClientFactory *client_factory); + McpDispatchOperation *self, TpClientFactory *client_factory); TpChannel *mcp_dispatch_operation_ref_nth_channel (McpDispatchOperation *self, - TpSimpleClientFactory *client_factory, + TpClientFactory *client_factory, guint n); /* virtual methods */ diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c index 66cc851..c326e19 100644 --- a/src/mcd-account-manager.c +++ b/src/mcd-account-manager.c @@ -89,7 +89,7 @@ G_DEFINE_TYPE_WITH_CODE (McdAccountManager, mcd_account_manager, G_TYPE_OBJECT, struct _McdAccountManagerPrivate { TpDBusDaemon *dbus_daemon; - TpSimpleClientFactory *client_factory; + TpClientFactory *client_factory; McdConnectivityMonitor *minotaur; McdStorage *storage; @@ -534,7 +534,7 @@ list_connection_names_cb (const gchar * const *names, gsize n, g_strdelimit (path, ".", '/'); DEBUG ("Killing connection"); - proxy = tp_simple_client_factory_ensure_connection ( + proxy = tp_client_factory_ensure_connection ( priv->client_factory, path, NULL, NULL); if (proxy) @@ -1467,10 +1467,9 @@ set_property (GObject *obj, guint prop_id, { case PROP_CLIENT_FACTORY: g_assert (priv->client_factory == NULL); /* construct-only */ - priv->client_factory = - TP_SIMPLE_CLIENT_FACTORY (g_value_dup_object (val)); + priv->client_factory = TP_CLIENT_FACTORY (g_value_dup_object (val)); priv->dbus_daemon = - tp_simple_client_factory_get_dbus_daemon (priv->client_factory); + tp_client_factory_get_dbus_daemon (priv->client_factory); g_object_ref (priv->dbus_daemon); break; @@ -1553,7 +1552,7 @@ mcd_account_manager_class_init (McdAccountManagerClass *klass) g_param_spec_object ("client-factory", "Client factory", "Client factory", - TP_TYPE_SIMPLE_CLIENT_FACTORY, + TP_TYPE_CLIENT_FACTORY, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); } @@ -1628,7 +1627,7 @@ _mcd_account_manager_constructed (GObject *obj) } McdAccountManager * -mcd_account_manager_new (TpSimpleClientFactory *client_factory) +mcd_account_manager_new (TpClientFactory *client_factory) { gpointer *obj; diff --git a/src/mcd-account-manager.h b/src/mcd-account-manager.h index 922f489..2c18fc7 100644 --- a/src/mcd-account-manager.h +++ b/src/mcd-account-manager.h @@ -61,7 +61,7 @@ struct _McdAccountManagerClass GType mcd_account_manager_get_type (void); McdAccountManager *mcd_account_manager_new ( - TpSimpleClientFactory *client_factory); + TpClientFactory *client_factory); TpDBusDaemon *mcd_account_manager_get_dbus_daemon (McdAccountManager *account_manager); diff --git a/src/mcd-channel.c b/src/mcd-channel.c index eed88ae..ac9ba08 100644 --- a/src/mcd-channel.c +++ b/src/mcd-channel.c @@ -603,7 +603,7 @@ mcd_channel_new_from_properties (TpConnection *connection, TpChannel *tp_chan; GError *error = NULL; - tp_chan = tp_simple_client_factory_ensure_channel ( + tp_chan = tp_client_factory_ensure_channel ( tp_proxy_get_factory (connection), connection, object_path, properties, &error); @@ -690,7 +690,7 @@ _mcd_channel_create_proxy (McdChannel *channel, TpConnection *connection, g_return_val_if_fail (MCD_IS_CHANNEL (channel), FALSE); - tp_chan = tp_simple_client_factory_ensure_channel ( + tp_chan = tp_client_factory_ensure_channel ( tp_proxy_get_factory (connection), connection, object_path, properties, &error); diff --git a/src/mcd-connection.c b/src/mcd-connection.c index cf8044e..8ebd584 100644 --- a/src/mcd-connection.c +++ b/src/mcd-connection.c @@ -77,7 +77,7 @@ G_DEFINE_TYPE (McdConnection, mcd_connection, MCD_TYPE_OPERATION); struct _McdConnectionPrivate { /* Factory for TpConnection objects */ - TpSimpleClientFactory *client_factory; + TpClientFactory *client_factory; /* Channel dispatcher */ McdDispatcher *dispatcher; @@ -1852,7 +1852,7 @@ mcd_connection_class_init (McdConnectionClass * klass) g_object_class_install_property (object_class, PROP_CLIENT_FACTORY, g_param_spec_object ("client-factory", "Client factory", - "Client factory", TP_TYPE_SIMPLE_CLIENT_FACTORY, + "Client factory", TP_TYPE_CLIENT_FACTORY, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property @@ -2206,7 +2206,7 @@ _mcd_connection_set_tp_connection (McdConnection *connection, } g_assert (priv->tp_conn == NULL); - priv->tp_conn = tp_simple_client_factory_ensure_connection ( + priv->tp_conn = tp_client_factory_ensure_connection ( priv->client_factory, obj_path, NULL, &inner_error); DEBUG ("new connection is %p", priv->tp_conn); if (!priv->tp_conn) diff --git a/src/mcd-manager.c b/src/mcd-manager.c index 5ad8684..d5d13be 100644 --- a/src/mcd-manager.c +++ b/src/mcd-manager.c @@ -58,7 +58,7 @@ struct _McdManagerPrivate { gchar *name; TpDBusDaemon *dbus_daemon; - TpSimpleClientFactory *client_factory; + TpClientFactory *client_factory; McdDispatcher *dispatcher; TpConnectionManager *tp_conn_mgr; @@ -236,7 +236,7 @@ _mcd_manager_set_property (GObject * obj, guint prop_id, g_assert (priv->client_factory == NULL); /* construct-only */ priv->client_factory = g_value_dup_object (val); priv->dbus_daemon = g_object_ref ( - tp_simple_client_factory_get_dbus_daemon (priv->client_factory)); + tp_client_factory_get_dbus_daemon (priv->client_factory)); break; default: @@ -295,7 +295,7 @@ mcd_manager_class_init (McdManagerClass * klass) g_object_class_install_property (object_class, PROP_CLIENT_FACTORY, g_param_spec_object ("client-factory", "Client factory", - "Client factory", TP_TYPE_SIMPLE_CLIENT_FACTORY, + "Client factory", TP_TYPE_CLIENT_FACTORY, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); readiness_quark = g_quark_from_static_string ("mcd_manager_got_info"); @@ -316,7 +316,7 @@ mcd_manager_init (McdManager *manager) McdManager * mcd_manager_new (const gchar *unique_name, McdDispatcher *dispatcher, - TpSimpleClientFactory *client_factory) + TpClientFactory *client_factory) { McdManager *obj; obj = MCD_MANAGER (g_object_new (MCD_TYPE_MANAGER, diff --git a/src/mcd-manager.h b/src/mcd-manager.h index a919395..4ec885a 100644 --- a/src/mcd-manager.h +++ b/src/mcd-manager.h @@ -62,7 +62,7 @@ struct _McdManagerClass GType mcd_manager_get_type (void); McdManager *mcd_manager_new (const gchar *unique_name, McdDispatcher *dispatcher, - TpSimpleClientFactory *client_factory); + TpClientFactory *client_factory); const gchar *mcd_manager_get_name (McdManager *manager); diff --git a/src/mcd-master.c b/src/mcd-master.c index 37c127b..9271c4b 100644 --- a/src/mcd-master.c +++ b/src/mcd-master.c @@ -90,7 +90,7 @@ struct _McdMasterPrivate /* We create these for our member objects */ TpDBusDaemon *dbus_daemon; - TpSimpleClientFactory *client_factory; + TpClientFactory *client_factory; /* Current pending sleep timer */ gint shutdown_timeout_id; @@ -203,7 +203,7 @@ mcd_master_constructor (GType type, guint n_params, umask (0077); #endif - priv->client_factory = tp_simple_client_factory_new (priv->dbus_daemon); + priv->client_factory = tp_client_factory_new (priv->dbus_daemon); priv->account_manager = mcd_account_manager_new (priv->client_factory); priv->dispatcher = mcd_dispatcher_new (priv->dbus_daemon, master); diff --git a/util/mc-tool.c b/util/mc-tool.c index 59a1a91..2f8d4b7 100644 --- a/util/mc-tool.c +++ b/util/mc-tool.c @@ -1423,7 +1423,7 @@ main (int argc, char **argv) TpAccountManager *am = NULL; TpAccount *a = NULL; TpDBusDaemon *dbus = NULL; - TpSimpleClientFactory *client_factory = NULL; + TpClientFactory *client_factory = NULL; GError *error = NULL; const GQuark features[] = { TP_ACCOUNT_FEATURE_CORE, TP_ACCOUNT_FEATURE_ADDRESSING, TP_ACCOUNT_FEATURE_STORAGE, 0 }; @@ -1442,22 +1442,22 @@ main (int argc, char **argv) app_name, command.common.name, error->message); goto out; } - client_factory = tp_simple_client_factory_new (dbus); + client_factory = tp_client_factory_new (dbus); if (command.common.account == NULL) { - TpSimpleClientFactory *factory; + TpClientFactory *factory; am = tp_account_manager_new (dbus); factory = tp_proxy_get_factory (am); - tp_simple_client_factory_add_account_features (factory, features); + tp_client_factory_add_account_features (factory, features); tp_proxy_prepare_async (am, NULL, manager_ready, NULL); } else { command.common.account = ensure_prefix (command.common.account); - a = tp_simple_client_factory_ensure_account (client_factory, + a = tp_client_factory_ensure_account (client_factory, command.common.account, NULL, &error); if (error != NULL) -- 1.8.4.rc3