[Pkg-telepathy-commits] [telepathy-mission-control-6] 205/280: update_storage: re-indent

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 3559e8dc58f847d58da2aa35ca4b7a18af8b93e1
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Nov 15 13:20:44 2013 +0000

    update_storage: re-indent
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27727
---
 src/mcd-storage.c | 60 +++++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/mcd-storage.c b/src/mcd-storage.c
index 77fd7b2..11dab99 100644
--- a/src/mcd-storage.c
+++ b/src/mcd-storage.c
@@ -1232,46 +1232,40 @@ update_storage (McdStorage *self,
   McpAccountManager *ma = MCP_ACCOUNT_MANAGER (self);
   gboolean updated = FALSE;
   McpAccountStorage *plugin;
+  const gchar *pn;
+  McpAccountStorageSetResult res;
 
   plugin = g_hash_table_lookup (self->accounts, account);
+  g_return_val_if_fail (plugin != NULL, FALSE);
+  pn = mcp_account_storage_name (plugin);
 
-  if (plugin != NULL)
-    {
-      const gchar *pn = mcp_account_storage_name (plugin);
-      McpAccountStorageSetResult res;
-
-      if (parameter)
-        res = mcp_account_storage_set_parameter (plugin, ma, account,
-            key, variant, MCP_PARAMETER_FLAG_NONE);
-      else
-        res = mcp_account_storage_set_attribute (plugin, ma, account,
-            key, variant, MCP_ATTRIBUTE_FLAG_NONE);
+  if (parameter)
+    res = mcp_account_storage_set_parameter (plugin, ma, account,
+        key, variant, MCP_PARAMETER_FLAG_NONE);
+  else
+    res = mcp_account_storage_set_attribute (plugin, ma, account,
+        key, variant, MCP_ATTRIBUTE_FLAG_NONE);
 
-      switch (res)
-        {
-          case MCP_ACCOUNT_STORAGE_SET_RESULT_CHANGED:
-            DEBUG ("MCP:%s -> store %s %s.%s", pn,
-                parameter ? "parameter" : "attribute", account, key);
-            updated = TRUE;
-            break;
+  switch (res)
+    {
+      case MCP_ACCOUNT_STORAGE_SET_RESULT_CHANGED:
+        DEBUG ("MCP:%s -> store %s %s.%s", pn,
+            parameter ? "parameter" : "attribute", account, key);
+        updated = TRUE;
+        break;
 
-          case MCP_ACCOUNT_STORAGE_SET_RESULT_FAILED:
-            DEBUG ("MCP:%s -> failed to store %s %s.%s",
-                pn, parameter ? "parameter" : "attribute", account, key);
-            break;
+      case MCP_ACCOUNT_STORAGE_SET_RESULT_FAILED:
+        DEBUG ("MCP:%s -> failed to store %s %s.%s",
+            pn, parameter ? "parameter" : "attribute", account, key);
+        break;
 
-          case MCP_ACCOUNT_STORAGE_SET_RESULT_UNCHANGED:
-            DEBUG ("MCP:%s -> no change to %s %s.%s",
-                pn, parameter ? "parameter" : "attribute", account, key);
-            break;
+      case MCP_ACCOUNT_STORAGE_SET_RESULT_UNCHANGED:
+        DEBUG ("MCP:%s -> no change to %s %s.%s",
+            pn, parameter ? "parameter" : "attribute", account, key);
+        break;
 
-          default:
-            g_warn_if_reached ();
-        }
-    }
-  else
-    {
-      g_assert_not_reached ();
+      default:
+        g_warn_if_reached ();
     }
 
   return updated;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git