Coding style fixes

diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index eeac5c130f3344a7d5ffd5418143f2fe0951c3df..692b4f05adf6654255fba21d3b43a3d9d9c37175 100644 (file)
--- 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 c0f21a31ce090539e78c7471913de9d78e8b7fae..d9231a50a24d3dbaa88c8ce14f650a45447deb45 100644 (file)
--- 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 4cd96e393ba1834e9afedffdfa83b9d19e700c1d..5727a8a2554c5d405caf067a1e74f1e78e171ff4 100644 (file)
--- 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 f498e11e34ba43a1195f8fc4561b32dbe5747f01..58f174eaa379fe0c0c01244615889585fe6fffe9 100644 (file)
--- 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 6a87a3fa5a76a8a0d542c97823251d10011d398d..150d6a43c7756ac34608454f072a8c0640df12a2 100644 (file)
--- 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 66107561472eeff98925e7561314471ec22739ce..0c4147951c24fbe1a18dd0c16b34d4bd0f073a8a 100644 (file)
--- 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 189bf0036d9025d006036d690dabc61dc50663aa..d0487e7616ab7dbf181fbe2a7c51967a5df8b6b1 100644 (file)
--- 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 13230d1a07b1dc19f5d13d8a3bf84d46e4250893..3d8fe6e12d856536653698508e1a4053c837093b 100644 (file)
--- 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 ();