merge of '392db9c2383dd6a8931565b8451179220d6cbbfc' release-2.2.1

Mon, 01 Oct 2007 17:44:04 +0000

author
Luke Schierer <lschiere@pidgin.im>
date
Mon, 01 Oct 2007 17:44:04 +0000
branch
release-2.2.1
changeset 20408
97e945cef795
parent 20407
392db9c2383d (current diff)
parent 20064
88c21e50426d (diff)
child 20409
82e9073951f6

merge of '392db9c2383dd6a8931565b8451179220d6cbbfc'
and '88c21e50426d7f139ecfdf059ebd108cdaa2d069'

libpurple/protocols/jabber/.todo file | annotate | diff | comparison | revisions
libpurple/protocols/jabber/message.c file | annotate | diff | comparison | revisions
libpurple/protocols/oscar/.todo file | annotate | diff | comparison | revisions
po/sr@Latn.po file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/jabber/message.c	Mon Oct 01 17:42:37 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Mon Oct 01 17:44:04 2007 +0000
@@ -41,10 +41,7 @@
 	g_free(jm->body);
 	g_free(jm->xhtml);
 	g_free(jm->password);
-	g_free(jm->error);
-	g_free(jm->thread_id);
 	g_list_free(jm->etc);
-	g_list_free(jm->eventitems);
 
 	g_free(jm);
 }

mercurial