diff libpurple/protocols/jabber/usermood.c @ 19699:680a3aea5eb6

Various warning fixes for the xmpp prpl.
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 10 Sep 2007 14:46:13 +0000
parents d32ed28cf645
children e10ed6060df3 ab38146f8f78
line wrap: on
line diff
--- a/libpurple/protocols/jabber/usermood.c	Mon Sep 10 14:37:40 2007 +0000
+++ b/libpurple/protocols/jabber/usermood.c	Mon Sep 10 14:46:13 2007 +0000
@@ -127,18 +127,17 @@
 		}
 	}
 	if (newmood != NULL) {
+		const char *status_id;
 		JabberBuddyResource *resource = jabber_buddy_find_resource(buddy, NULL);
 		if(!resource) { /* huh? */
-			if (moodtext)
-				g_free(moodtext);
+			g_free(moodtext);
 			return;
 		}
-		const char *status_id = jabber_buddy_state_get_status_id(resource->state);
-		
+		status_id = jabber_buddy_state_get_status_id(resource->state);
+
 		purple_prpl_got_user_status(js->gc->account, from, status_id, "mood", _(newmood), "moodtext", moodtext?moodtext:"", NULL);
 	}
-	if (moodtext)
-		g_free(moodtext);
+	g_free(moodtext);
 }
 
 void jabber_mood_init(void) {