Merge branch 'sjoerd-mc5' into mc5

Conflicts:
	libempathy-gtk/empathy-account-widget.c
	libempathy-gtk/empathy-protocol-chooser.c

1 files changed, 18 insertions, 15 deletions

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 256d05ba4..df99ea1c5 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -302,7 +302,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;
@@ -386,7 +386,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);
 
@@ -479,7 +480,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;
@@ -498,7 +499,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);
@@ -517,7 +518,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;
 
@@ -531,7 +532,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;
 
@@ -545,7 +546,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;
@@ -888,7 +889,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);
@@ -911,8 +913,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);
@@ -959,7 +961,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);
@@ -977,8 +980,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);
 
@@ -1017,8 +1020,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))