[telepathy-gabble/telepathy-gabble-0.8] presence-cache.c: self_avatar_resolve_conflict(): remove unnecessary indentation

[Alban Crequy]

---
 src/presence-cache.c |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/presence-cache.c b/src/presence-cache.c
index ea93350..d6e8590 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -664,30 +664,30 @@ self_avatar_resolve_conflict (GabblePresenceCache *cache)
   GabblePresence *presence = priv->conn->self_presence;
 
   /* We don't want recursive image resetting */
-  if (!priv->avatar_reset_pending)
-    {
-      /* according to XEP-0153 section 4.3-2. 3rd bullet:
-       * if we receive a photo from another resource, then we MUST
-       * immediately send a presence update with an empty update child
-       * element (no photo node), then re-download our own vCard;
-       * when that arrives, we may start setting the photo node in our
-       * presence again.
-       */
-      GError *error = NULL;
-      priv->avatar_reset_pending = TRUE;
-      presence->avatar_sha1 = NULL;
-      if (!_gabble_connection_signal_own_presence (priv->conn, &error))
-        {
-          DEBUG ("failed to send own presence: %s", error->message);
-          g_error_free (error);
-        }
+  if (priv->avatar_reset_pending)
+    return;
 
-      gabble_vcard_manager_invalidate_cache (priv->conn->vcard_manager,
-          base_conn->self_handle);
-      gabble_vcard_manager_request (priv->conn->vcard_manager,
-          base_conn->self_handle, 0, self_vcard_request_cb, cache,
-          NULL);
+  /* according to XEP-0153 section 4.3-2. 3rd bullet:
+   * if we receive a photo from another resource, then we MUST
+   * immediately send a presence update with an empty update child
+   * element (no photo node), then re-download our own vCard;
+   * when that arrives, we may start setting the photo node in our
+   * presence again.
+   */
+  GError *error = NULL;
+  priv->avatar_reset_pending = TRUE;
+  presence->avatar_sha1 = NULL;
+  if (!_gabble_connection_signal_own_presence (priv->conn, &error))
+    {
+      DEBUG ("failed to send own presence: %s", error->message);
+      g_error_free (error);
     }
+
+  gabble_vcard_manager_invalidate_cache (priv->conn->vcard_manager,
+      base_conn->self_handle);
+  gabble_vcard_manager_request (priv->conn->vcard_manager,
+      base_conn->self_handle, 0, self_vcard_request_cb, cache,
+      NULL);
 }
 
 static void
-- 
1.5.6.5