im.pidgin.pidgin.2.2.3: df736f0509a9c17cf47058d700e092e8dd78982e

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: df736f0509a9c17cf47058d700e092e8dd78982e
Ancestor: f4d8cbf8a61d287559b322f03cce2e2845c2f71e
Author: datallah at pidgin.im
Date: 2007-10-26T04:57:04
Branch: im.pidgin.pidgin.2.2.3

Modified files:
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

applied changes from ed57ec421d050f904b97089466de8ae146506957
             through 9d0fba0e0edc763a880b7b5261ae1023f340c97b

applied changes from 7793ae5b4dd75b3c2f62c2502dbd08c76dbe7b1c
             through c7c88ffd833bca4ab16f164907b32ea5dff2ae6a

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/jabber.c	2fc323fdb93593509842bb2e199726742389f0b7
+++ libpurple/protocols/bonjour/jabber.c	c8f885925e2466642b3e097d4ea2468b291f0086
@@ -367,7 +367,6 @@ void bonjour_jabber_stream_ended(PurpleB
 
 void bonjour_jabber_stream_ended(PurpleBuddy *pb) {
 	BonjourBuddy *bb = pb->proto_data;
-	PurpleConversation *conv;
 
 	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", pb->name);
 
@@ -375,12 +374,15 @@ void bonjour_jabber_stream_ended(PurpleB
 
 	/* Inform the user that the conversation has been closed */
 	if (bb->conversation != NULL) {
+#if 0
+		PurpleConversation *conv;
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, pb->account);
 		if (conv != NULL) {
 			char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name);
 			purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
 			g_free(tmp);
 		}
+#endif
 		/* Close the socket, clear the watcher and free memory */
 		bonjour_jabber_close_conversation(bb->conversation);
 		bb->conversation = NULL;
============================================================
--- libpurple/protocols/bonjour/mdns_win32.c	aeba928ec9fa711f19c2bfbbee52b2ca9c1469c1
+++ libpurple/protocols/bonjour/mdns_win32.c	8bc1f161b418aff325567fb49844083d0258cc18
@@ -150,7 +150,6 @@ _mdns_resolve_host_callback(GSList *host
 	g_slist_free(hosts);
 
 	/* free the remaining args memory */
-	purple_dnsquery_destroy(args->query);
 	g_free(args->full_service_name);
 	g_free(args);
 }
============================================================
--- libpurple/protocols/oscar/oscar.c	c9c6bf1e13ed01716383124adcda1d4d99446f92
+++ libpurple/protocols/oscar/oscar.c	74432c2aa91a474b8f3a53ff8960c2c805c76a33
@@ -4766,10 +4766,11 @@ static int purple_ssi_parseerr(OscarData
 
 	if (reason == 0x0005) {
 		purple_notify_error(gc, NULL, _("Unable To Retrieve Buddy List"),
-						  _("The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."));
+						  _("The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."));
 		if (od->getblisttimer > 0)
 			purple_timeout_remove(od->getblisttimer);
 		od->getblisttimer = purple_timeout_add(30000, purple_ssi_rerequestdata, od);
+		return 1;
 	}
 
 	oscar_set_extendedstatus(gc);