# HG changeset patch # User Mark Doliner # Date 1313892662 0 # Node ID 67f8717477eaf114bacbeb2f46d700fa84f90b54 # Parent 7df08e88d9bb9c6c7d8a1948f3ab478c078f9aec Remove some deprecated stuff diff -r 7df08e88d9bb -r 67f8717477ea ChangeLog.API --- a/ChangeLog.API Sun Aug 21 01:59:13 2011 +0000 +++ b/ChangeLog.API Sun Aug 21 02:11:02 2011 +0000 @@ -13,6 +13,8 @@ the first parameter Removed: + * pidgin_blist_update_account_error_state + * PIDGIN_DIALOG * purple_core_migrate * purple_notify_searchresults_column_get_title * purple_notify_searchresults_get_columns_count @@ -24,6 +26,9 @@ * purple_strlcpy * purple_util_fetch_url_request_len_with_account. Use purple_util_fetch_url_request_len, insetad. + * The 'clipboard_text_string' and 'clipboard_html_string' members of + GtkIMHtml + * The 'sg' member of PidginConversation version 2.10.0: libpurple: diff -r 7df08e88d9bb -r 67f8717477ea pidgin/gtkblist.c --- a/pidgin/gtkblist.c Sun Aug 21 01:59:13 2011 +0000 +++ b/pidgin/gtkblist.c Sun Aug 21 02:11:02 2011 +0000 @@ -5343,6 +5343,28 @@ } +/** + * 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, @@ -5427,18 +5449,6 @@ } } -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)); -} - static gboolean paint_headline_hbox (GtkWidget *widget, GdkEventExpose *event, diff -r 7df08e88d9bb -r 67f8717477ea pidgin/gtkblist.h --- a/pidgin/gtkblist.h Sun Aug 21 01:59:13 2011 +0000 +++ b/pidgin/gtkblist.h Sun Aug 21 02:11:02 2011 +0000 @@ -370,20 +370,6 @@ void pidgin_append_blist_node_extended_menu(GtkWidget *menu, PurpleBlistNode *node); /** - * 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. - * @deprecated There was no good reason for code other than gtkconn to call - * this. - */ -void pidgin_blist_update_account_error_state(PurpleAccount *account, const char *message); - -/** * Sets a headline notification * * This is currently used for mail notification, but could theoretically be used for anything. diff -r 7df08e88d9bb -r 67f8717477ea pidgin/gtkconv.h --- a/pidgin/gtkconv.h Sun Aug 21 01:59:13 2011 +0000 +++ b/pidgin/gtkconv.h Sun Aug 21 02:11:02 2011 +0000 @@ -132,8 +132,8 @@ GtkTextBuffer *entry_buffer; GtkWidget *entry; gboolean auto_resize; /* this is set to TRUE if the conversation - * is being resized by a non-user-initiated - * event, such as the buddy icon appearing + * is being resized by a non-user-initiated + * event, such as the buddy icon appearing */ gboolean entry_growing; /* True if the size of the entry was set * automatically by typing too much to fit @@ -144,12 +144,6 @@ GtkWidget *tab_label; GtkWidget *menu_icon; GtkWidget *menu_label; -#if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKCONV_C_) - /** @deprecated */ - GtkSizeGroup *sg; -#else - gpointer depr1; -#endif GtkWidget *lower_hbox; diff -r 7df08e88d9bb -r 67f8717477ea pidgin/gtkdialogs.h --- a/pidgin/gtkdialogs.h Sun Aug 21 01:59:13 2011 +0000 +++ b/pidgin/gtkdialogs.h Sun Aug 21 02:11:02 2011 +0000 @@ -58,15 +58,7 @@ void pidgin_dialogs_remove_contact(PurpleContact *); void pidgin_dialogs_merge_groups(PurpleGroup *, const char *); -/* Everything after this should probably be moved elsewhere */ - -#ifndef PIDGIN_DISABLE_DEPRECATED -/* This PIDGIN_DISABLE_DEPRECATED doesn't need to be deactivated by - * _PIDGIN_GTKDIALOGS_C_, because it shouldn't be using this macro. */ -#define PIDGIN_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \ - gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG) -#endif - +/* This macro should probably be moved elsewhere */ #define PIDGIN_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED) #endif /* _PIDGINDIALOGS_H_ */ diff -r 7df08e88d9bb -r 67f8717477ea pidgin/gtkimhtml.h --- a/pidgin/gtkimhtml.h Sun Aug 21 01:59:13 2011 +0000 +++ b/pidgin/gtkimhtml.h Sun Aug 21 02:11:02 2011 +0000 @@ -135,16 +135,6 @@ GtkTextTag *link; } edit; -#if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKIMHTML_C_) - /** @deprecated */ - char *clipboard_text_string; - /** @deprecated */ - char *clipboard_html_string; -#else - char *depr1; - char *depr2; -#endif - GSList *im_images; GtkIMHtmlFuncs *funcs; GtkSourceUndoManager *undo_manager;