/soc/2013/ankitkv/gobjectification: a551c0de8f70: Merged default...

[Ankit Vani]

Changeset: a551c0de8f707a5c57e80b65b4f6720dd1e94c7f
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-05 03:38 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/a551c0de8f70

Description:

Merged default branch

diffstat:

 libpurple/keyring.c |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff --git a/libpurple/keyring.c b/libpurple/keyring.c
--- a/libpurple/keyring.c
+++ b/libpurple/keyring.c
@@ -835,6 +835,7 @@ purple_keyring_get_password(PurpleAccoun
 			_("No keyring configured."));
 		cb(account, NULL, error, data);
 		g_error_free(error);
+		return;
 	}
 
 	read_cb = purple_keyring_get_read_password(inuse);