diff options
-rw-r--r-- | libempathy/empathy-account-manager.c | 11 | ||||
-rw-r--r-- | libempathy/empathy-account-settings.c | 33 | ||||
-rw-r--r-- | libempathy/empathy-account.c | 8 | ||||
-rw-r--r-- | libempathy/empathy-dispatcher.c | 1 |
4 files changed, 30 insertions, 23 deletions
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c index 2057581d4..727eb7eaf 100644 --- a/libempathy/empathy-account-manager.c +++ b/libempathy/empathy-account-manager.c @@ -847,10 +847,13 @@ empathy_account_manager_created_cb (TpAccountManager *proxy, void empathy_account_manager_create_account_async (EmpathyAccountManager *manager, - const gchar *connection_manager, - const gchar *protocol, const gchar *display_name, - GHashTable *parameters, GHashTable *properties, - GAsyncReadyCallback callback, gpointer user_data) + const gchar *connection_manager, + const gchar *protocol, + const gchar *display_name, + GHashTable *parameters, + GHashTable *properties, + GAsyncReadyCallback callback, + gpointer user_data) { EmpathyAccountManagerPriv *priv = GET_PRIV (manager); GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (manager), diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 2763f0702..0b92ec1b1 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -301,7 +301,7 @@ empathy_account_settings_dispose (GObject *object) static void empathy_account_settings_free_unset_parameters ( - EmpathyAccountSettings *settings) + EmpathyAccountSettings *settings) { EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); int i; @@ -368,7 +368,8 @@ empathy_account_settings_check_readyness (EmpathyAccountSettings *self) static void empathy_account_settings_ready_cb (GObject *obj, - GParamSpec *spec, gpointer user_data) + GParamSpec *spec, + gpointer user_data) { EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data); @@ -458,7 +459,7 @@ empathy_account_settings_get_account (EmpathyAccountSettings *settings) static gboolean empathy_account_settings_is_unset (EmpathyAccountSettings *settings, - const gchar *param) + const gchar *param) { EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); GArray *a; @@ -477,7 +478,7 @@ empathy_account_settings_is_unset (EmpathyAccountSettings *settings, static TpConnectionManagerParam * empathy_account_settings_get_tp_param (EmpathyAccountSettings *settings, - const gchar *param) + const gchar *param) { TpConnectionManagerParam *tp_params = empathy_account_settings_get_tp_params (settings); @@ -496,7 +497,7 @@ empathy_account_settings_get_tp_param (EmpathyAccountSettings *settings, const GValue * empathy_account_settings_get_default (EmpathyAccountSettings *settings, - const gchar *param) + const gchar *param) { TpConnectionManagerParam *p; @@ -510,7 +511,7 @@ empathy_account_settings_get_default (EmpathyAccountSettings *settings, const gchar * empathy_settings_get_dbus_signature (EmpathyAccountSettings *settings, - const gchar *param) + const gchar *param) { TpConnectionManagerParam *p; @@ -524,7 +525,7 @@ empathy_settings_get_dbus_signature (EmpathyAccountSettings *settings, const GValue * empathy_account_settings_get (EmpathyAccountSettings *settings, - const gchar *param) + const gchar *param) { EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); const GValue *result = NULL; @@ -821,7 +822,8 @@ empathy_account_settings_set_display_name_finish ( static void empathy_account_settings_account_updated (GObject *source, - GAsyncResult *result, gpointer user_data) + GAsyncResult *result, + gpointer user_data) { EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data); EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); @@ -844,8 +846,8 @@ empathy_account_settings_account_updated (GObject *source, static void empathy_account_settings_created_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data); EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); @@ -892,7 +894,8 @@ empathy_account_settings_do_create_account (EmpathyAccountSettings *settings) static void empathy_account_settings_manager_ready_cb (EmpathyAccountManager *manager, - GParamSpec *spec, gpointer user_data) + GParamSpec *spec, + gpointer user_data) { EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data); EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); @@ -910,8 +913,8 @@ empathy_account_settings_manager_ready_cb (EmpathyAccountManager *manager, void empathy_account_settings_apply_async (EmpathyAccountSettings *settings, - GAsyncReadyCallback callback, - gpointer user_data) + GAsyncReadyCallback callback, + gpointer user_data) { EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); @@ -950,8 +953,8 @@ empathy_account_settings_apply_async (EmpathyAccountSettings *settings, gboolean empathy_account_settings_apply_finish (EmpathyAccountSettings *settings, - GAsyncResult *result, - GError **error) + GAsyncResult *result, + GError **error) { if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c index 4585d33cf..df948b69c 100644 --- a/libempathy/empathy-account.c +++ b/libempathy/empathy-account.c @@ -200,7 +200,8 @@ empathy_account_get_property (GObject *object, } static void -empathy_account_update (EmpathyAccount *account, GHashTable *properties) +empathy_account_update (EmpathyAccount *account, + GHashTable *properties) { EmpathyAccountPriv *priv = GET_PRIV (account); const gchar *conn_path; @@ -401,7 +402,7 @@ empathy_account_unescape_protocol (const gchar *protocol, gssize len) static gboolean empathy_account_parse_unique_name (const gchar *bus_name, - gchar **protocol, gchar **manager) + gchar **protocol, gchar **manager) { const gchar *proto, *proto_end; const gchar *cm, *cm_end; @@ -780,7 +781,8 @@ empathy_account_is_ready (EmpathyAccount *account) EmpathyAccount * -empathy_account_new (TpDBusDaemon *dbus, const gchar *unique_name) +empathy_account_new (TpDBusDaemon *dbus, + const gchar *unique_name) { return EMPATHY_ACCOUNT (g_object_new (EMPATHY_TYPE_ACCOUNT, "dbus-daemon", dbus, diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index fe330256d..03f5fc1b8 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -1057,7 +1057,6 @@ empathy_dispatcher_class_init (EmpathyDispatcherClass *klass) g_type_class_add_private (object_class, sizeof (EmpathyDispatcherPriv)); - klass->dbus_props_class.interfaces = prop_interfaces; tp_dbus_properties_mixin_class_init (object_class, G_STRUCT_OFFSET (EmpathyDispatcherClass, dbus_props_class)); |