# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1129164781 0
# Node ID 1f95b6308195bf233bdf81a3be77679ed3ab7a51
# Parent  13f19073c0e1f9c51a7741ae148e71bb1f35ebbf
[gaim-migrate @ 13931]
I don't know why, but these always bug me

committer: Tailor Script <tailor@pidgin.im>

diff -r 13f19073c0e1 -r 1f95b6308195 src/protocols/simple/simple.c
--- a/src/protocols/simple/simple.c	Thu Oct 13 00:41:25 2005 +0000
+++ b/src/protocols/simple/simple.c	Thu Oct 13 00:53:01 2005 +0000
@@ -113,7 +113,7 @@
 
 	if(account->gc) sip = account->gc->proto_data;
 	if(sip) {
-		if(sip->status) g_free(sip->status);
+		g_free(sip->status);
 		if(primitive == GAIM_STATUS_AVAILABLE) sip->status = g_strdup("available");
 		else sip->status = g_strdup("busy");
 
@@ -178,7 +178,7 @@
 	struct sip_connection *conn = connection_find(sip, fd);
 	sip->openconns = g_slist_remove(sip->openconns, conn);
 	if(conn->inputhandler) gaim_input_remove(conn->inputhandler);
-	if(conn->inbuf) g_free(conn->inbuf);
+	g_free(conn->inbuf);
 	g_free(conn);
 }
 
@@ -1301,21 +1301,21 @@
 	do_register_exp(sip, 0);
 	connection_free_all(sip);
 	if(sip) {
-		if(sip->servername) g_free(sip->servername);
-		if(sip->username) g_free(sip->username);
-		if(sip->password) g_free(sip->password);
-		if(sip->registrar.nonce) g_free(sip->registrar.nonce);
-		if(sip->registrar.realm) g_free(sip->registrar.realm);
-		if(sip->proxy.nonce) g_free(sip->proxy.nonce);
-		if(sip->proxy.realm) g_free(sip->proxy.realm);
-		if(sip->sendlater) g_free(sip->sendlater);
-		if(sip->ip) g_free(sip->ip);
-		if(sip->realhostname) g_free(sip->realhostname);
+		g_free(sip->servername);
+		g_free(sip->username);
+		g_free(sip->password);
+		g_free(sip->registrar.nonce);
+		g_free(sip->registrar.realm);
+		g_free(sip->proxy.nonce);
+		g_free(sip->proxy.realm);
+		g_free(sip->sendlater);
+		g_free(sip->ip);
+		g_free(sip->realhostname);
 		if(sip->listenpa) gaim_input_remove(sip->listenpa);
 		if(sip->registertimeout) gaim_timeout_remove(sip->registertimeout);
 		sip->servername = sip->username = sip->password = sip->registrar.nonce = sip->registrar.realm = sip->proxy.nonce = sip->proxy.realm = sip->sendlater = sip->ip = sip->realhostname = NULL;
 	}
-	if(gc->proto_data) g_free(gc->proto_data);
+	g_free(gc->proto_data);
 	gc->proto_data = 0;
 }