pidgin: 182921a9: Move a debug message. I'm assuming it's...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 182921a907be1010df1892d7b97b1b7edc3ffec6
Ancestor: c18f0b937508a4838b418093b46adc70bdded382
Author: markdoliner at pidgin.im
Date: 2010-03-18T08:05:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/182921a907be1010df1892d7b97b1b7edc3ffec6

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

Move a debug message.  I'm assuming it's supposed to be related to this
icq_relay_xstatus thing?  The previous version of the code printing this
message even if msgtype != 26... that was probably wrong.

Also only free rtfmsg if it's non-NULL (we already have a check for that,
might as well use it)

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	2ab15092dae721866c4dbff11488fa3a93b79980
+++ libpurple/protocols/oscar/oscar.c	f257dd0e4105ccad11ef13233dd6f487e42a230d
@@ -2720,7 +2720,6 @@ incomingim_chan2(OscarData *od, FlapConn
 	{
 		purple_debug_info("oscar", "Got an ICQ Server Relay message of "
 				"type %d\n", args->info.rtfmsg.msgtype);
-		purple_debug_info("oscar", "Sending X-Status Reply\n");
 
 		if (args->info.rtfmsg.msgtype == 1)
 		{
@@ -2736,11 +2735,13 @@ incomingim_chan2(OscarData *od, FlapConn
 					if (g_utf8_validate(args->info.rtfmsg.rtfmsg, strlen(args->info.rtfmsg.rtfmsg), NULL))
 						rtfmsg = g_strdup(args->info.rtfmsg.rtfmsg);
 				}
-				if (rtfmsg)
+				if (rtfmsg) {
 					serv_got_im(gc, userinfo->bn, rtfmsg, flags, time(NULL));
-				g_free(rtfmsg);
+					g_free(rtfmsg);
+				}
 			}
-		} else if(args->info.rtfmsg.msgtype == 26)
+		} else if (args->info.rtfmsg.msgtype == 26)
+			purple_debug_info("oscar", "Sending X-Status Reply\n");
 			icq_relay_xstatus(od, userinfo->bn, args->cookie);
 
 	}