# HG changeset patch # User andrew.victor@mxit.com # Date 1316125331 0 # Node ID 20dfcc9aa471ada7b629f69fa1582b2d13b9f86f # Parent 694382c3d150561836075bb81dd2ea52d81ef6c8 Remove deprecated PidginBuddyList.connection_errors. diff -r 694382c3d150 -r 20dfcc9aa471 ChangeLog.API --- a/ChangeLog.API Thu Sep 15 22:02:55 2011 +0000 +++ b/ChangeLog.API Thu Sep 15 22:22:11 2011 +0000 @@ -104,6 +104,7 @@ * pidgin_dialogs_alias_contact * pidgin_set_custom_buddy_icon * pidgin_setup_screenname_autocomplete + * PidginBuddyList.connection_errors * PidginConversation.sg * purple_account_add_buddies_with_invite * purple_account_add_buddy_with_invite diff -r 694382c3d150 -r 20dfcc9aa471 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Thu Sep 15 22:02:55 2011 +0000 +++ b/pidgin/gtkblist.c Thu Sep 15 22:22:11 2011 +0000 @@ -4763,8 +4763,6 @@ PidginBuddyList *gtkblist; gtkblist = g_new0(PidginBuddyList, 1); - gtkblist->connection_errors = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL, g_free); gtkblist->priv = g_new0(PidginBuddyListPrivate, 1); blist->ui_data = gtkblist; @@ -5078,7 +5076,6 @@ generic_error_destroy_cb(GtkObject *dialog, PurpleAccount *account) { - g_hash_table_remove(gtkblist->connection_errors, account); /* If the error dialog is being destroyed in response to the * account-error-changed signal, we don't want to clear the current * error. @@ -5336,28 +5333,6 @@ } -/** - * Was used by the connection API to tell the blist if an account has a - * connection error or no longer has a connection error, but the blist now does - * this itself with the @ref account-error-changed signal. - * - * @param account The account that either has a connection error - * or no longer has a connection error. - * @param message The connection error message, or NULL if this - * account is no longer in an error state. - */ -static void -pidgin_blist_update_account_error_state(PurpleAccount *account, const char *text) -{ - /* connection_errors isn't actually used anywhere; it's just kept in - * sync with reality in case a plugin uses it. - */ - if (text == NULL) - g_hash_table_remove(gtkblist->connection_errors, account); - else - g_hash_table_insert(gtkblist->connection_errors, account, g_strdup(text)); -} - /* Call appropriate error notification code based on error types */ static void update_account_error_state(PurpleAccount *account, @@ -5371,12 +5346,6 @@ if (old == NULL && new == NULL) return; - /* For backwards compatibility: */ - if (new) - pidgin_blist_update_account_error_state(account, new->description); - else - pidgin_blist_update_account_error_state(account, NULL); - if (new != NULL) pidgin_blist_select_notebook_page(gtkblist); @@ -6884,7 +6853,6 @@ if (gtkblist->drag_timeout) g_source_remove(gtkblist->drag_timeout); - g_hash_table_destroy(gtkblist->connection_errors); gtkblist->refresh_timer = 0; gtkblist->timeout = 0; gtkblist->drag_timeout = 0; diff -r 694382c3d150 -r 20dfcc9aa471 pidgin/gtkblist.h --- a/pidgin/gtkblist.h Thu Sep 15 22:02:55 2011 +0000 +++ b/pidgin/gtkblist.h Thu Sep 15 22:22:11 2011 +0000 @@ -86,15 +86,6 @@ GtkWidget *menutray; /**< The menu tray widget. */ GtkWidget *menutrayicon; /**< The menu tray icon. */ - /** Caches connection error messages; keys are #PurpleAccount and - * values are non-@c NULL const char *s containing localised - * error messages. (If an account does not have an error, it will not - * appear in the table.) - * @deprecated in favour of purple_account_get_current_error(), which also - * gives you the #PurpleConnectionError value. - */ - GHashTable *connection_errors; - guint refresh_timer; /**< The timer for refreshing every 30 seconds */ guint timeout; /**< The timeout for the tooltip. */