Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jabber.c	Sun Dec 20 20:46:34 2015 -0800
+++ b/libpurple/protocols/jabber/jabber.c	Mon Dec 21 14:46:12 2015 -0500
@@ -101,10 +101,8 @@
 {
 	char *open_stream;
 
-	if (js->stream_id) {
-		g_free(js->stream_id);
-		js->stream_id = NULL;
-	}
+	g_free(js->stream_id);
+	js->stream_id = NULL;
 
 	open_stream = g_strdup_printf("<stream:stream to='%s' "
 				          "xmlns='" NS_XMPP_CLIENT "' "
@@ -2638,10 +2636,8 @@
 
 	if((jb = jabber_buddy_find(js, who, TRUE)) &&
 			(jbr = jabber_buddy_find_resource(jb, jid->resource))) {
-		if(jbr->thread_id) {
-			g_free(jbr->thread_id);
-			jbr->thread_id = NULL;
-		}
+		g_free(jbr->thread_id);
+		jbr->thread_id = NULL;
 	}
 
 	jabber_id_free(jid);