[Gaim-commits] SF.net SVN: gaim: [17138] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 17138
          http://svn.sourceforge.net/gaim/?rev=17138&view=rev
Author:   mayuan2006
Date:     2006-09-03 07:42:38 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
fix the bug of oim delete

committed by MaYuan<may...@gm...>

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/command.c
    branches/soc-2006-msnp13/src/protocols/msn/group.c
    branches/soc-2006-msnp13/src/protocols/msn/oim.c
    branches/soc-2006-msnp13/src/protocols/msn/soap.h

Modified: branches/soc-2006-msnp13/src/protocols/msn/command.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/command.c	2006-09-03 08:01:12 UTC (rev 17137)
+++ branches/soc-2006-msnp13/src/protocols/msn/command.c	2006-09-03 14:42:38 UTC (rev 17138)
@@ -24,6 +24,10 @@
 #include "msn.h"
 #include "command.h"
 
+/*local Function prototype*/
+int msn_get_payload_position(char *str);
+int msn_set_payload_len(MsnCommand *cmd);
+
 static gboolean
 is_num(char *str)
 {

Modified: branches/soc-2006-msnp13/src/protocols/msn/group.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/group.c	2006-09-03 08:01:12 UTC (rev 17137)
+++ branches/soc-2006-msnp13/src/protocols/msn/group.c	2006-09-03 14:42:38 UTC (rev 17138)
@@ -76,7 +76,7 @@
 char*
 msn_group_get_id(const MsnGroup *group)
 {
-	g_return_val_if_fail(group != NULL, -1);
+	g_return_val_if_fail(group != NULL, NULL);
 
 	return group->id;
 }

Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-09-03 08:01:12 UTC (rev 17137)
+++ branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-09-03 14:42:38 UTC (rev 17138)
@@ -425,6 +425,7 @@
 		msg_id = oim->oim_list->data;
 		msn_oim_post_delete_msg(oim,msg_id);
 		oim->oim_list = g_list_remove(oim->oim_list, oim->oim_list->data);
+		g_free(msg_id);
 	}
 
 	g_free(passport);
@@ -503,7 +504,7 @@
 		oim->oim_list = g_list_append(oim->oim_list,msgid);
 		msn_oim_post_single_get_msg(oim,msgid);
 		g_free(passport);
-		g_free(msgid);
+//		g_free(msgid);
 		g_free(rTime);
 		g_free(nickname);
 	}

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.h	2006-09-03 08:01:12 UTC (rev 17137)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.h	2006-09-03 14:42:38 UTC (rev 17138)
@@ -123,6 +123,7 @@
 /*init a soap conneciton */
 void msn_soap_init(MsnSoapConn *soapconn,char * host,int ssl,GaimSslInputFunction connect_cb,GaimSslErrorFunction error_cb);
 void msn_soap_connect(MsnSoapConn *soapconn);
+void msn_soap_close(MsnSoapConn *soapconn);
 
 /*write to soap*/
 void msn_soap_write(MsnSoapConn * soapconn, char *write_buf, GaimInputFunction written_cb);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.