changeset 31867:af709c6ab032

Remove PurpleConnectionUiOps.report_disconnect

--- a/ChangeLog.API	Sun Aug 21 04:09:13 2011 +0000
+++ b/ChangeLog.API	Sun Aug 21 07:34:02 2011 +0000
@@ -13,12 +13,15 @@
 		  the first parameter
 
 		Removed:
+		* GtkIMHtml.clipboard_html_string
+		* GtkIMHtml.clipboard_text_string
 		* pidgin_blist_update_account_error_state
 		* pidgin_check_if_dir
 		* PIDGIN_DIALOG
 		* pidgin_dialogs_alias_contact
 		* pidgin_set_custom_buddy_icon
 		* pidgin_setup_screenname_autocomplete
+		* PidginConversation.sg
 		* purple_core_migrate
 		* purple_notify_searchresults_column_get_title
 		* purple_notify_searchresults_get_columns_count
@@ -30,10 +33,8 @@
 		* purple_strlcpy
 		* purple_util_fetch_url_request_len_with_account.  Use
 		  purple_util_fetch_url_request_len, insetad.
+		* PurpleConnectionUiOps.report_disconnect
 		* struct _GtkIMHtmlFontDetail
-		* The 'clipboard_text_string' and 'clipboard_html_string' members of
-		  GtkIMHtml
-		* The 'sg' member of PidginConversation
 
 version 2.10.0:
 	libpurple:

--- a/finch/gntconn.c	Sun Aug 21 04:09:13 2011 +0000
+++ b/finch/gntconn.c	Sun Aug 21 07:34:02 2011 +0000
@@ -165,7 +165,6 @@
 	NULL, /* connected */
 	NULL, /* disconnected */
 	NULL, /* notice */
-	NULL,
 	NULL, /* network_connected */
 	NULL, /* network_disconnected */
 	finch_connection_report_disconnect,

--- a/libpurple/connection.c	Sun Aug 21 04:09:13 2011 +0000
+++ b/libpurple/connection.c	Sun Aug 21 07:34:02 2011 +0000
@@ -578,13 +578,8 @@
 
 	ops = purple_connections_get_ui_ops();
 
-	if (ops != NULL)
-	{
-		if (ops->report_disconnect_reason != NULL)
-			ops->report_disconnect_reason (gc, reason, description);
-		if (ops->report_disconnect != NULL)
-			ops->report_disconnect (gc, description);
-	}
+	if (ops && ops->report_disconnect_reason)
+		ops->report_disconnect_reason(gc, reason, description);
 
 	purple_signal_emit(purple_connections_get_handle(), "connection-error",
 		gc, reason, description);

--- a/libpurple/connection.h	Sun Aug 21 04:09:13 2011 +0000
+++ b/libpurple/connection.h	Sun Aug 21 07:34:02 2011 +0000
@@ -194,16 +194,6 @@
 	void (*notice)(PurpleConnection *gc, const char *text);
 
 	/**
-	 * Called when an error causes a connection to be disconnected.
-	 * Called before #disconnected.
-	 * @param text  a localized error message.
-	 * @see #purple_connection_error
-	 * @deprecated in favour of
-	 *             #PurpleConnectionUiOps.report_disconnect_reason.
-	 */
-	void (*report_disconnect)(PurpleConnection *gc, const char *text);
-
-	/**
 	 * Called when libpurple discovers that the computer's network
 	 * connection is active.  On Linux, this uses Network Manager if
 	 * available; on Windows, it uses Win32's network change notification
@@ -219,17 +209,15 @@
 
 	/**
 	 * Called when an error causes a connection to be disconnected.
-	 *  Called before #disconnected.  This op is intended to replace
-	 *  #report_disconnect.  If both are implemented, this will be called
-	 *  first; however, there's no real reason to implement both.
+	 * Called before #disconnected.
 	 *
-	 *  @param reason  why the connection ended, if known, or
-	 *                 #PURPLE_CONNECTION_ERROR_OTHER_ERROR, if not.
-	 *  @param text  a localized message describing the disconnection
-	 *               in more detail to the user.
-	 *  @see #purple_connection_error_reason
+	 * @param reason  why the connection ended, if known, or
+	 *                #PURPLE_CONNECTION_ERROR_OTHER_ERROR, if not.
+	 * @param text  a localized message describing the disconnection
+	 *              in more detail to the user.
+	 * @see #purple_connection_error_reason
 	 *
-	 *  @since 2.3.0
+	 * @since 2.3.0
 	 */
 	void (*report_disconnect_reason)(PurpleConnection *gc,
 	                                 PurpleConnectionError reason,

--- a/pidgin/gtkconn.c	Sun Aug 21 04:09:13 2011 +0000
+++ b/pidgin/gtkconn.c	Sun Aug 21 07:34:02 2011 +0000
@@ -215,7 +215,6 @@
 	pidgin_connection_connected,
 	pidgin_connection_disconnected,
 	pidgin_connection_notice,
-	NULL, /* report_disconnect */
 	pidgin_connection_network_connected,
 	pidgin_connection_network_disconnected,
 	pidgin_connection_report_disconnect_reason,