diff libpurple/protocols/msn/msn.c @ 31393:b4285ea42b6e

msn_message_destroy() calls msn_message_unref() if refcount>0. This is always the case. So change all code to call msn_message_unref() directly and change msn_message_destroy to be a private function. This should be more clear.
author Mark Doliner <mark@kingant.net>
date Mon, 22 Nov 2010 07:40:23 +0000
parents a328691c761a
children 193cbfcfc935 b1022aa66b8a
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Mon Nov 22 07:32:57 2010 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon Nov 22 07:40:23 2010 +0000
@@ -132,7 +132,7 @@
 	swboard = msn_session_get_swboard(session, username, MSN_SB_FLAG_IM);
 
 	msn_switchboard_send_msg(swboard, msg, TRUE);
-	msn_message_destroy(msg);
+	msn_message_unref(msg);
 
 	return TRUE;
 }
@@ -1393,7 +1393,7 @@
 	msn_message_set_bin_data(msg, body->str, body->len);
 
 	msn_switchboard_send_msg(swboard, msg, TRUE);
-	msn_message_destroy(msg);
+	msn_message_unref(msg);
 }
 
 static void msn_emoticon_destroy(MsnEmoticon *emoticon)
@@ -1582,7 +1582,7 @@
 			purple_timeout_add(0, msn_send_me_im, imdata);
 		}
 
-		msn_message_destroy(msg);
+		msn_message_unref(msg);
 	} else {
 		/*send Offline Instant Message,only to MSN Passport User*/
 		char *friendname;
@@ -1646,7 +1646,7 @@
 
 	msn_switchboard_send_msg(swboard, msg, FALSE);
 
-	msn_message_destroy(msg);
+	msn_message_unref(msg);
 
 	return MSN_TYPING_SEND_TIMEOUT;
 }
@@ -2072,7 +2072,7 @@
 	}
 
 	msn_switchboard_send_msg(swboard, msg, FALSE);
-	msn_message_destroy(msg);
+	msn_message_unref(msg);
 
 	g_free(msgformat);
 	g_free(msgtext);