[Pkg-telepathy-commits] [telepathy-mission-control-6] 217/280: mcd_storage_delete_account: don't tolerate deletion of unknown accounts

[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 183af896db254c19eedc62ad58d5e2b08297791f
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Nov 15 16:31:47 2013 +0000

    mcd_storage_delete_account: don't tolerate deletion of unknown accounts
    
    We should always know what we're deleting, now.
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27727
---
 src/mcd-storage.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/mcd-storage.c b/src/mcd-storage.c
index ba8420a..d3bc5da 100644
--- a/src/mcd-storage.c
+++ b/src/mcd-storage.c
@@ -1809,13 +1809,7 @@ mcd_storage_delete_account (McdStorage *self,
   g_return_if_fail (account != NULL);
 
   plugin = g_hash_table_lookup (self->accounts, account);
-
-  if (plugin == NULL)
-    {
-      /* we wanted no account, we got no account, I call that success! */
-      return;
-    }
-
+  g_return_if_fail (plugin != NULL);
 
   /* FIXME: stop ignoring the error (if any), and make this method async
    * in order to pass the error up to McdAccount */

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