Mercurial > pidgin.yaz
changeset 32326:c3ea1711c372
Rename the report_disconnect_reason cb function to report_disconnect
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 21 Aug 2011 07:37:07 +0000 |
| parents | af709c6ab032 |
| children | c80ac2d937b7 |
| files | ChangeLog.API libpurple/connection.c libpurple/connection.h pidgin/gtkconn.c |
| diffstat | 4 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Sun Aug 21 07:34:02 2011 +0000 +++ b/ChangeLog.API Sun Aug 21 07:37:07 2011 +0000 @@ -11,6 +11,8 @@ 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 @@ * 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:
--- a/libpurple/connection.c Sun Aug 21 07:34:02 2011 +0000 +++ b/libpurple/connection.c Sun Aug 21 07:37:07 2011 +0000 @@ -578,8 +578,8 @@ 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);
--- a/libpurple/connection.h Sun Aug 21 07:34:02 2011 +0000 +++ b/libpurple/connection.h Sun Aug 21 07:37:07 2011 +0000 @@ -219,9 +219,9 @@ * * @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);
--- a/pidgin/gtkconn.c Sun Aug 21 07:34:02 2011 +0000 +++ b/pidgin/gtkconn.c Sun Aug 21 07:37:07 2011 +0000 @@ -136,9 +136,9 @@ } 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 @@ pidgin_connection_notice, pidgin_connection_network_connected, pidgin_connection_network_disconnected, - pidgin_connection_report_disconnect_reason, + pidgin_connection_report_disconnect, NULL, NULL, NULL