diff libpurple/protocols/msn/user.c @ 20399:6f986caeab59

merge of 'b4911943cba6f29cf0694dfd563cac17612236dc' and 'c28931a50bfa21e0be81777bcd91fdeab9116d77'

--- a/libpurple/protocols/msn/user.c	Sun Apr 15 04:12:27 2007 +0000
+++ b/libpurple/protocols/msn/user.c	Sun Apr 15 04:29:56 2007 +0000
@@ -222,16 +222,20 @@
 
 	g_return_if_fail(user != NULL);
 
-	if (filename == NULL || g_stat(filename, &st) == -1){
+	if (filename == NULL || g_stat(filename, &st) == -1)
+	{
 		msn_user_set_object(user, NULL);
-	}else if ((fp = g_fopen(filename, "rb")) != NULL){
+	}
+	else if ((fp = g_fopen(filename, "rb")) != NULL)
+	{
 		PurpleCipherContext *ctx;
 		char *buf;
 		gsize len;
 		char *base64;
 		unsigned char digest[20];
 
-		if (msnobj == NULL)	{
+		if (msnobj == NULL)
+		{
 			msnobj = msn_object_new();
 			msn_object_set_local(msnobj);
 			msn_object_set_type(msnobj, MSN_OBJECT_USERTILE);
@@ -283,7 +287,9 @@
 		base64 = purple_base64_encode(digest, sizeof(digest));
 		msn_object_set_sha1c(msnobj, base64);
 		g_free(base64);
-	}else{
+	}
+	else
+	{
 		purple_debug_error("msn", "Unable to open buddy icon %s!\n", filename);
 		msn_user_set_object(user, NULL);
 	}
@@ -317,13 +323,15 @@
 
 	g = purple_find_group(group_name);
 
-	if ((id == NULL) && (g == NULL)){
+	if ((id == NULL) && (g == NULL))
+	{
 		g = purple_group_new(group_name);
 		purple_blist_add_group(g, NULL);
 	}
 
 	b = purple_find_buddy_in_group(account, passport, g);
-	if (b == NULL){
+	if (b == NULL)
+	{
 		b = purple_buddy_new(account, passport, NULL);
 		purple_blist_add_buddy(b, NULL, g, NULL);
 	}