Mercurial > pidgin
changeset 21719:47870b1ae413
merge of 'a51a84aa5d61b6fd78e58a4450a25e667a87e1cb'
and 'e05eec5600476b95f0b6c2876bb92323027643f7'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 02 Dec 2007 02:39:15 +0000 |
| parents | 9487a26750d8 (current diff) 1c9f741ee9c7 (diff) |
| children | ea56d9386081 |
| files | |
| diffstat | 3 files changed, 2 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- 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 \
--- 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); }
--- 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);