pidgin: 2b73ff57: Rename the report_disconnect_reason cb f...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 2b73ff57ff12722b94a5f9bca55d75c72912af38
Parent:   decc53d7ccf47667a39c4af96677e68b2b6c1a08
Author:   markdoliner at pidgin.im
Date:     08/21/11 03:37:07
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2b73ff57ff12722b94a5f9bca55d75c72912af38

Changelog: 

Rename the report_disconnect_reason cb function to report_disconnect

Changes against parent decc53d7ccf47667a39c4af96677e68b2b6c1a08

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

-------------- next part --------------
============================================================
--- libpurple/connection.c	fe71528d0f9455fbfa498cac43d04397b6c6f753
+++ libpurple/connection.c	9423e002ba4d8557114d52d6822cd9aee137ee93
@@ -578,8 +578,8 @@ purple_connection_error_reason (PurpleCo
 
 	ops = purple_connections_get_ui_ops();
 
-	if (ops && ops->report_disconnect_reason)
-		ops->report_disconnect_reason(gc, reason, description);
+	if (ops && ops->report_disconnect)
+		ops->report_disconnect(gc, reason, description);
 
 	purple_signal_emit(purple_connections_get_handle(), "connection-error",
 		gc, reason, description);
============================================================
--- libpurple/connection.h	64edb9cbc7a4a25883ea3551147476d805d7bcad
+++ libpurple/connection.h	f8a68c8977b354bfeae0bfe4323eb436a5a48b45
@@ -219,9 +219,9 @@ typedef struct
 	 *
 	 * @since 2.3.0
 	 */
-	void (*report_disconnect_reason)(PurpleConnection *gc,
-	                                 PurpleConnectionError reason,
-	                                 const char *text);
+	void (*report_disconnect)(PurpleConnection *gc,
+	                          PurpleConnectionError reason,
+	                          const char *text);
 
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
============================================================
--- pidgin/gtkconn.c	e8fcd836f7029a5f3e975dd4f26e3a8c9da469dd
+++ pidgin/gtkconn.c	0bcaf66811e3665cdc7a09b3de6502346a367677
@@ -136,9 +136,9 @@ static void
 }
 
 static void
-pidgin_connection_report_disconnect_reason (PurpleConnection *gc,
-                                            PurpleConnectionError reason,
-                                            const char *text)
+pidgin_connection_report_disconnect(PurpleConnection *gc,
+                                    PurpleConnectionError reason,
+                                    const char *text)
 {
 	PurpleAccount *account = NULL;
 	PidginAutoRecon *info;
@@ -217,7 +217,7 @@ static PurpleConnectionUiOps conn_ui_ops
 	pidgin_connection_notice,
 	pidgin_connection_network_connected,
 	pidgin_connection_network_disconnected,
-	pidgin_connection_report_disconnect_reason,
+	pidgin_connection_report_disconnect,
 	NULL,
 	NULL,
 	NULL
============================================================
--- ChangeLog.API	fc99fe2417f6b99a2c54d0dcf1c2584bd4b2cf27
+++ ChangeLog.API	2a934c047e2670cb103440c8f1bcbcd39be56730
@@ -11,6 +11,8 @@ version 3.0.0 (??/??/????):
 		Changed:
 		* purple_util_fetch_url_request_len now takes a PurpleAccount as
 		  the first parameter
+		* PurpleConnectionUiOps.report_disconnect now passes a
+		  PurpleConnectionError as the second parameter
 
 		Removed:
 		* GtkIMHtml.clipboard_html_string
@@ -33,7 +35,7 @@ version 3.0.0 (??/??/????):
 		* purple_strlcpy
 		* purple_util_fetch_url_request_len_with_account.  Use
 		  purple_util_fetch_url_request_len, insetad.
-		* PurpleConnectionUiOps.report_disconnect
+		* PurpleConnectionUiOps.report_disconnect_reason
 		* struct _GtkIMHtmlFontDetail
 
 version 2.10.0: