pidgin: 8d3ea174: This is the way we plug the leaks, plug ...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 8d3ea174f97cdd8fa6752235c89ad34e18ee6a3a
Ancestor: b725a868979d3684d56802d944d313498b8ca91a
Author: datallah at pidgin.im
Date: 2008-05-03T17:56:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8d3ea174f97cdd8fa6752235c89ad34e18ee6a3a

Modified files:
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/slp.c

ChangeLog: 

This is the way we plug the leaks, plug the leaks, plug the leaks...

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c	6d2b4780389020bb6bbfefa3b55ad0fefa2e0f3a
+++ libpurple/protocols/msn/contact.c	75a4c77646a13a3be3a18552dae32844f34645be
@@ -498,11 +498,12 @@ msn_parse_addressbook_mobile(xmlnode *co
 					mobile_number = xmlnode_get_data(number);
 
 					if (mobile_number &&
-						(messenger_enabled = xmlnode_get_child(contact_phone, "isMessengerEnabled")) 
-						&& (is_messenger_enabled = xmlnode_get_data(messenger_enabled)) 
-						&& !strcmp(is_messenger_enabled, "true"))
+							(messenger_enabled = xmlnode_get_child(contact_phone, "isMessengerEnabled")) 
+							&& (is_messenger_enabled = xmlnode_get_data(messenger_enabled)) 
+							&& !strcmp(is_messenger_enabled, "true"))
 						mobile = TRUE;
 
+					g_free(mobile_number);
 					g_free(is_messenger_enabled);
 				}
 			}
@@ -691,6 +692,7 @@ msn_parse_addressbook(MsnContact * conta
 				g_free(errorcode);
 				return TRUE;
 			}
+			g_free(errorcode);
 		}
 
 		return FALSE;
============================================================
--- libpurple/protocols/msn/oim.c	4ff5b0d2e4a50e78154b347eb6f8f72b3db795b1
+++ libpurple/protocols/msn/oim.c	47f44889144bdbcd8abbff53b650d6d07861992a
@@ -170,7 +170,6 @@ msn_oim_send_read_cb(MsnSoapMessage *req
 								msg->oim_msg);
 							g_queue_push_head(oim->send_queue, msg);
 							msn_oim_send_msg(oim);
-							return;
 						} else {
 							purple_debug_info("msnoim",
 								"can't find lock key for OIM: %s\n",
@@ -191,9 +190,10 @@ msn_oim_send_read_cb(MsnSoapMessage *req
 						purple_debug_info("MSNP14","resending OIM: %s\n", msg->oim_msg);
 						g_queue_push_head(oim->send_queue, msg);
 						msn_oim_send_msg(oim);
-						return;
 					}
 				}
+
+				g_free(faultcode_str);
 			}
 		}
 	}
============================================================
--- libpurple/protocols/msn/slp.c	9788bb47d805a16af5afecacc52be74af1c37bb9
+++ libpurple/protocols/msn/slp.c	76959ee1244c7384b547b33ce6f56b744155b8b5
@@ -359,6 +359,7 @@ got_sessionreq(MsnSlpCall *slpcall, cons
 			g_free(bin);
 
 			purple_xfer_set_filename(xfer, file_name);
+			g_free(file_name);
 			purple_xfer_set_size(xfer, file_size);
 			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
 			purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel);