pidgin: 03e320ba: Remove some deprecated stuff
markdoliner at pidgin.im
markdoliner at pidgin.im
Sat Aug 20 22:15:33 EDT 2011
----------------------------------------------------------------------
Revision: 03e320bafb3858f3d9599532af4cc637d818dc09
Parent: 112f4162ac9fa90ad23dd6dd980da6a804986890
Author: markdoliner at pidgin.im
Date: 08/20/11 22:11:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/03e320bafb3858f3d9599532af4cc637d818dc09
Changelog:
Remove some deprecated stuff
Changes against parent 112f4162ac9fa90ad23dd6dd980da6a804986890
patched ChangeLog.API
patched pidgin/gtkblist.c
patched pidgin/gtkblist.h
patched pidgin/gtkconv.h
patched pidgin/gtkdialogs.h
patched pidgin/gtkimhtml.h
-------------- next part --------------
============================================================
--- pidgin/gtkimhtml.h a2ea72c153f16ea2829f25a5c4149859ce570313
+++ pidgin/gtkimhtml.h 3cb69db6da5618d650d04031aec257cfec7ff260
@@ -135,16 +135,6 @@ struct _GtkIMHtml {
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;
============================================================
--- pidgin/gtkconv.h 0b9059014e778f17ce61d6fec8bac51516337c8e
+++ pidgin/gtkconv.h 7297b62e0003c7b7ac9cf77f2eaf7d0c94ead043
@@ -132,8 +132,8 @@ struct _PidginConversation
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 @@ struct _PidginConversation
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;
============================================================
--- pidgin/gtkblist.c 448f490b43c2e0a2883944d358650ab8a76c7cdf
+++ pidgin/gtkblist.c ec8abc91a9cfa8fe64b93d1b44f58a8dbbbe1202
@@ -5343,6 +5343,28 @@ update_signed_on_elsewhere_tooltip(Purpl
}
+/**
+ * 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 @@ show_initial_account_errors(PidginBuddyL
}
}
-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,
============================================================
--- pidgin/gtkblist.h c1c72bb0f636fcc80513e900ca9c8904781c4c1a
+++ pidgin/gtkblist.h f08fbccf480440eaab1bfe00f72d2ff3a8d3b2de
@@ -370,20 +370,6 @@ void pidgin_append_blist_node_extended_m
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.
============================================================
--- ChangeLog.API 9bf90ff6e7c34f12a6872cdf008026c90bb549d3
+++ ChangeLog.API 96441c081a020b7987da346db8f25d11b135b21e
@@ -13,6 +13,8 @@ version 3.0.0 (??/??/????):
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 @@ version 3.0.0 (??/??/????):
* 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:
============================================================
--- pidgin/gtkdialogs.h 8e01df0c9a76839d22444d976be6273c9072e078
+++ pidgin/gtkdialogs.h 740344749ce0b6f89bba2c650ebe63aa670eee06
@@ -58,15 +58,7 @@ void pidgin_dialogs_merge_groups(PurpleG
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_ */
More information about the Commits
mailing list