# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1313913448 0
# Node ID 5105d0306b2ac08719fc3a8f3af1df42e9022804
# Parent  27b3ad94e1e3fc25637a44d4699063524407c170
Remove purple_connection_error

diff -r 27b3ad94e1e3 -r 5105d0306b2a ChangeLog.API
--- a/ChangeLog.API	Sun Aug 21 07:57:00 2011 +0000
+++ b/ChangeLog.API	Sun Aug 21 07:57:28 2011 +0000
@@ -24,6 +24,7 @@
 		* 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
diff -r 27b3ad94e1e3 -r 5105d0306b2a libpurple/connection.c
--- a/libpurple/connection.c	Sun Aug 21 07:57:00 2011 +0000
+++ b/libpurple/connection.c	Sun Aug 21 07:57:28 2011 +0000
@@ -528,21 +528,6 @@
 }
 
 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)
diff -r 27b3ad94e1e3 -r 5105d0306b2a libpurple/connection.h
--- a/libpurple/connection.h	Sun Aug 21 07:57:00 2011 +0000
+++ b/libpurple/connection.h	Sun Aug 21 07:57:28 2011 +0000
@@ -453,21 +453,6 @@
 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