# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1196563155 0
# Node ID 47870b1ae41307cd144265795288ec9eabf3b118
# Parent  9487a26750d8f027bf8512bc003a8c329a3f7a16# Parent  1c9f741ee9c7c5b3276dd372e79bf04a37db7189
merge of 'a51a84aa5d61b6fd78e58a4450a25e667a87e1cb'
     and 'e05eec5600476b95f0b6c2876bb92323027643f7'

diff -r 9487a26750d8 -r 47870b1ae413 Makefile.am
--- a/Makefile.am	Sun Dec 02 02:38:11 2007 +0000
+++ b/Makefile.am	Sun Dec 02 02:39:15 2007 +0000
@@ -9,6 +9,7 @@
 		README.MTN \
 		README.mingw \
 		config.h.mingw \
+		doxy2devhelp.xsl \
 		gaim.pc.in \
 		gaim-uninstalled.pc.in \
 		intltool-extract.in \
diff -r 9487a26750d8 -r 47870b1ae413 libpurple/account.c
--- a/libpurple/account.c	Sun Dec 02 02:38:11 2007 +0000
+++ b/libpurple/account.c	Sun Dec 02 02:39:15 2007 +0000
@@ -741,7 +741,7 @@
 
 	current_error = g_new0(PurpleConnectionErrorInfo, 1);
 	current_error->type = type;
-	current_error->description = description;
+	current_error->description = g_strdup(description);
 
 	set_current_error(account, current_error);
 }
diff -r 9487a26750d8 -r 47870b1ae413 libpurple/connection.c
--- a/libpurple/connection.c	Sun Dec 02 02:38:11 2007 +0000
+++ b/libpurple/connection.c	Sun Dec 02 02:39:15 2007 +0000
@@ -219,9 +219,6 @@
 {
 	PurpleAccount *account;
 	GSList *buddies;
-#if 0
-	GList *wins;
-#endif
 	PurplePluginProtocolInfo *prpl_info = NULL;
 	gboolean remove = FALSE;
 
@@ -269,19 +266,6 @@
 
 	purple_signal_emit(purple_connections_get_handle(), "signed-off", gc);
 
-#if 0
-	/* see comment later in file on if 0'd same code */
-	/*
-	 * XXX This is a hack! Remove this and replace it with a better event
-	 *     notification system.
-	 */
-	for (wins = purple_get_windows(); wins != NULL; wins = wins->next) {
-		PurpleConvWindow *win = (PurpleConvWindow *)wins->data;
-		purple_conversation_update(purple_conv_window_get_conversation_at(win, 0),
-								 PURPLE_CONV_ACCOUNT_OFFLINE);
-	}
-#endif
-
 	purple_account_request_close_with_account(account);
 	purple_request_close_with_handle(gc);
 	purple_notify_close_with_handle(gc);