pidgin: 1f514253: Remove purple_connection_error

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 1f514253ddd9ee1eaeaab94d37dfd0c8186b0fe4
Parent:   92e0db801462b9373779cd078c175111764f58af
Author:   markdoliner at pidgin.im
Date:     08/21/11 03:57:28
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1f514253ddd9ee1eaeaab94d37dfd0c8186b0fe4

Changelog: 

Remove purple_connection_error

Changes against parent 92e0db801462b9373779cd078c175111764f58af

  patched  ChangeLog.API
  patched  libpurple/connection.c
  patched  libpurple/connection.h

-------------- next part --------------
============================================================
--- libpurple/connection.c	9423e002ba4d8557114d52d6822cd9aee137ee93
+++ libpurple/connection.c	3df7e683632b0ffbb878ddee6cd20be3ce87095c
@@ -528,21 +528,6 @@ void
 }
 
 void
-purple_connection_error(PurpleConnection *gc, const char *text)
-{
-	/* prpls that have not been updated to use disconnection reasons will
-	 * be setting wants_to_die before calling this function, so choose
-	 * PURPLE_CONNECTION_ERROR_OTHER_ERROR (which is fatal) if it's true,
-	 * and PURPLE_CONNECTION_ERROR_NETWORK_ERROR (which isn't) if not.  See
-	 * the documentation in connection.h.
-	 */
-	PurpleConnectionError reason = gc->wants_to_die
-	                             ? PURPLE_CONNECTION_ERROR_OTHER_ERROR
-	                             : PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-	purple_connection_error_reason (gc, reason, text);
-}
-
-void
 purple_connection_error_reason (PurpleConnection *gc,
                                 PurpleConnectionError reason,
                                 const char *description)
============================================================
--- libpurple/connection.h	f8a68c8977b354bfeae0bfe4323eb436a5a48b45
+++ libpurple/connection.h	7451f7ab69e099c633ccf85942badacd22c43c50
@@ -453,21 +453,6 @@ void purple_connection_notice(PurpleConn
 void purple_connection_notice(PurpleConnection *gc, const char *text);
 
 /**
- * Closes a connection with an error.
- *
- * @param gc     The connection.
- * @param reason The error text, which may not be @c NULL.
- * @deprecated in favour of #purple_connection_error_reason.  Calling
- *  @c purple_connection_error(gc, text) is equivalent to calling
- *  @c purple_connection_error_reason(gc, reason, text) where @c reason is
- *  #PURPLE_CONNECTION_ERROR_OTHER_ERROR if @c gc->wants_to_die is @c TRUE, and
- *  #PURPLE_CONNECTION_ERROR_NETWORK_ERROR if not.  (This is to keep
- *  auto-reconnection behaviour the same when using old prpls which don't use
- *  reasons yet.)
- */
-void purple_connection_error(PurpleConnection *gc, const char *reason);
-
-/**
  * Closes a connection with an error and a human-readable description of the
  * error.  It also sets @c gc->wants_to_die to the value of
  * #purple_connection_error_is_fatal(@a reason), mainly for
============================================================
--- ChangeLog.API	2a934c047e2670cb103440c8f1bcbcd39be56730
+++ ChangeLog.API	2dc218d72e860321c597e5afef0602f25de4497e
@@ -24,6 +24,7 @@ version 3.0.0 (??/??/????):
 		* pidgin_set_custom_buddy_icon
 		* pidgin_setup_screenname_autocomplete
 		* PidginConversation.sg
+		* purple_connection_error
 		* purple_core_migrate
 		* purple_notify_searchresults_column_get_title
 		* purple_notify_searchresults_get_columns_count