Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/bonjour/jabber.c	Thu Oct 25 23:29:00 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Fri Oct 26 04:57:04 2007 +0000
@@ -367,7 +367,6 @@
 
 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 @@
 
 	/* 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;

--- a/libpurple/protocols/bonjour/mdns_win32.c	Thu Oct 25 23:29:00 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Fri Oct 26 04:57:04 2007 +0000
@@ -150,7 +150,6 @@
 	g_slist_free(hosts);
 
 	/* free the remaining args memory */
-	purple_dnsquery_destroy(args->query);
 	g_free(args->full_service_name);
 	g_free(args);
 }

--- a/libpurple/protocols/oscar/oscar.c	Thu Oct 25 23:29:00 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Fri Oct 26 04:57:04 2007 +0000
@@ -4766,10 +4766,11 @@
 
 	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);