aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-account-manager.c2
-rw-r--r--libempathy/empathy-account-settings.h4
-rw-r--r--libempathy/empathy-account.c6
-rw-r--r--libempathy/empathy-account.h2
-rw-r--r--libempathy/empathy-connection-managers.c2
-rw-r--r--libempathy/empathy-connection-managers.h4
-rw-r--r--libempathy/empathy-log-store-empathy.c2
-rw-r--r--src/empathy.c8
8 files changed, 15 insertions, 15 deletions
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index eeac5c130..692b4f05a 100644
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@ -789,7 +789,7 @@ empathy_account_manager_created_cb (TpAccountManager *proxy,
if (error != NULL)
{
- g_simple_async_result_set_from_error (result, (GError *)error);
+ g_simple_async_result_set_from_error (result, (GError *) error);
g_simple_async_result_complete (result);
g_object_unref (G_OBJECT (result));
return;
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index c0f21a31c..d9231a50a 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -41,11 +41,11 @@ struct _EmpathyAccountSettings {
gpointer priv;
};
-GType empathy_account_settings_get_type(void);
+GType empathy_account_settings_get_type (void);
/* TYPE MACROS */
#define EMPATHY_TYPE_ACCOUNT_SETTINGS \
- (empathy_account_settings_get_type())
+ (empathy_account_settings_get_type ())
#define EMPATHY_ACCOUNT_SETTINGS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), \
EMPATHY_TYPE_ACCOUNT_SETTINGS, EmpathyAccountSettings))
diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c
index 4cd96e393..5727a8a25 100644
--- a/libempathy/empathy-account.c
+++ b/libempathy/empathy-account.c
@@ -901,7 +901,7 @@ empathy_account_updated_cb (TpAccount *proxy,
if (error != NULL)
{
- g_simple_async_result_set_from_error (result, (GError *)error);
+ g_simple_async_result_set_from_error (result, (GError *) error);
}
g_simple_async_result_complete (result);
@@ -910,7 +910,7 @@ empathy_account_updated_cb (TpAccount *proxy,
void
empathy_account_update_settings_async (EmpathyAccount *account,
- const GHashTable *parameters, const gchar **unset_parameters,
+ GHashTable *parameters, const gchar **unset_parameters,
GAsyncReadyCallback callback, gpointer user_data)
{
EmpathyAccountPriv *priv = GET_PRIV (account);
@@ -919,7 +919,7 @@ empathy_account_update_settings_async (EmpathyAccount *account,
tp_cli_account_call_update_parameters (priv->account,
-1,
- (GHashTable *)parameters,
+ parameters,
unset_parameters,
empathy_account_updated_cb,
result,
diff --git a/libempathy/empathy-account.h b/libempathy/empathy-account.h
index f498e11e3..58f174eaa 100644
--- a/libempathy/empathy-account.h
+++ b/libempathy/empathy-account.h
@@ -73,7 +73,7 @@ gboolean empathy_account_is_valid (EmpathyAccount *account);
gboolean empathy_account_is_ready (EmpathyAccount *account);
void empathy_account_update_settings_async (EmpathyAccount *account,
- const GHashTable *parameters, const gchar **unset_parameters,
+ GHashTable *parameters, const gchar **unset_parameters,
GAsyncReadyCallback callback, gpointer user_data);
gboolean empathy_account_update_settings_finish (EmpathyAccount *account,
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 6a87a3fa5..150d6a43c 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -245,7 +245,7 @@ empathy_connection_managers_listed_cb (TpConnectionManager * const *cms,
for (iter = cms ; iter != NULL && *iter != NULL; iter++)
{
/* only list cms that didn't hit errors */
- if (tp_connection_manager_is_ready(*iter))
+ if (tp_connection_manager_is_ready (*iter))
priv->cms = g_list_prepend (priv->cms, g_object_ref (*iter));
}
diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h
index 661075614..0c4147951 100644
--- a/libempathy/empathy-connection-managers.h
+++ b/libempathy/empathy-connection-managers.h
@@ -39,11 +39,11 @@ struct _EmpathyConnectionManagers {
gpointer priv;
};
-GType empathy_connection_managers_get_type(void);
+GType empathy_connection_managers_get_type (void);
/* TYPE MACROS */
#define EMPATHY_TYPE_CONNECTION_MANAGERS \
- (empathy_connection_managers_get_type())
+ (empathy_connection_managers_get_type ())
#define EMPATHY_CONNECTION_MANAGERS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CONNECTION_MANAGERS, \
EmpathyConnectionManagers))
diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 189bf0036..d0487e761 100644
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -123,7 +123,7 @@ log_store_empathy_get_dir (EmpathyLogStore *self,
* by % */
escaped = g_strdup (empathy_account_get_unique_name (account) + 1);
- g_strdelimit(escaped, "/", '%');
+ g_strdelimit (escaped, "/", '%');
if (chatroom)
basedir = g_build_path (G_DIR_SEPARATOR_S, priv->basedir, escaped,
diff --git a/src/empathy.c b/src/empathy.c
index 13230d1a0..3d8fe6e12 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -244,7 +244,7 @@ create_salut_account_if_needed (EmpathyConnectionManagers *managers)
GError *error = NULL;
- if (!should_create_salut_account())
+ if (!should_create_salut_account ())
return;
manager = empathy_connection_managers_get_cm (managers, "salut");
@@ -253,14 +253,14 @@ create_salut_account_if_needed (EmpathyConnectionManagers *managers)
DEBUG ("Salut not installed, not making a salut account");
return;
}
-
+
protocol = tp_connection_manager_get_protocol (manager, "local-xmpp");
if (protocol == NULL)
{
DEBUG ("Salut doesn't support local-xmpp!!");
return;
}
-
+
DEBUG ("Trying to add a salut account...");
/* Get self EContact from EDS */
@@ -325,7 +325,7 @@ create_salut_account (void)
{
EmpathyConnectionManagers *managers;
- if (!should_create_salut_account())
+ if (!should_create_salut_account ())
return;
managers = empathy_connection_managers_dup_singleton ();