pidgin/pidgin

Remove purple_connection_notice

19 months ago, Gary Kramlich
b55196b7ba2d
Parents 318204db6284
Children 61b1b01b8de4
Remove purple_connection_notice

It wasn't used in Finch, was a no-op in pidgin, and none of the protocol plugins
used it. In the future we'll just add a "notice" flag or something to
PurpleMessage when we need it.

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1808/
5 files changed, 2 insertions(+), 34 deletions(-)
  • +2 -0
    ChangeLog.API
  • +0 -1
    finch/gntconn.c
  • +0 -14
    libpurple/connection.c
  • +0 -15
    libpurple/connection.h
  • +0 -4
    pidgin/gtkconn.c
    • --- a/ChangeLog.API Tue Sep 20 01:31:47 2022 -0500
    +++ b/ChangeLog.API Tue Sep 20 01:34:26 2022 -0500
    @@ -404,10 +404,12 @@
    * PURPLE_CONNECTION_FLAG_ALLOW_CUSTOM_SMILEY
    * purple_connection_new
    * purple_connection_new_unregister
    + * purple_connection_notice
    * purple_connection_destroy
    * purple_connection_set_account
    * purple_connection_ssl_error
    * PurpleConnectionUiOps->connect_progress
    + * PurpleConnectionUiOps->notice
    * purple_connection_update_progress
    * purple_connections_get_connecting
    * purple_contact_set_alias
    --- a/finch/gntconn.c Tue Sep 20 01:31:47 2022 -0500
    +++ b/finch/gntconn.c Tue Sep 20 01:34:26 2022 -0500
    @@ -125,7 +125,6 @@
    {
    NULL, /* connected */
    NULL, /* disconnected */
    - NULL, /* notice */
    NULL, /* network_connected */
    NULL, /* network_disconnected */
    finch_connection_report_disconnect,
    --- a/libpurple/connection.c Tue Sep 20 01:31:47 2022 -0500
    +++ b/libpurple/connection.c Tue Sep 20 01:34:26 2022 -0500
    @@ -332,20 +332,6 @@
    return gc->wants_to_die;
    }
    -void
    -purple_connection_notice(PurpleConnection *gc, const char *text) {
    - PurpleConnectionUiOps *ops;
    -
    - g_return_if_fail(PURPLE_IS_CONNECTION(gc));
    - g_return_if_fail(text != NULL);
    -
    - ops = purple_connections_get_ui_ops();
    -
    - if(ops != NULL && ops->notice != NULL) {
    - ops->notice(gc, text);
    - }
    -}
    -
    static gboolean
    purple_connection_disconnect_cb(gpointer data) {
    PurpleAccount *account = data;
    --- a/libpurple/connection.h Tue Sep 20 01:31:47 2022 -0500
    +++ b/libpurple/connection.h Tue Sep 20 01:34:26 2022 -0500
    @@ -115,10 +115,6 @@
    * <link linkend="connections-signing-off"><literal>"signing-off"</literal></link>
    * and <link linkend="connections-signed-off"><literal>"signed-off"</literal></link>
    * signals).
    - * @notice: Used to display connection-specific notices. (Pidgin's Gtk user
    - * interface implements this as a no-op; purple_connection_notice(),
    - * which uses this operation, is not used by any of the protocols
    - * shipped with libpurple.)
    * @network_connected: Called when libpurple discovers that the computer's
    * network connection is active. On Linux, this uses
    * Network Manager if available; on Windows, it uses
    @@ -145,8 +141,6 @@
    void (*connected)(PurpleConnection *gc);
    void (*disconnected)(PurpleConnection *gc);
    - void (*notice)(PurpleConnection *gc, const char *text);
    -
    void (*network_connected)(void);
    void (*network_disconnected)(void);
    @@ -342,15 +336,6 @@
    void *purple_connection_get_protocol_data(PurpleConnection *gc);
    /**
    - * purple_connection_notice:
    - * @gc: The connection.
    - * @text: The notice text.
    - *
    - * Displays a connection-specific notice.
    - */
    -void purple_connection_notice(PurpleConnection *gc, const char *text);
    -
    -/**
    * purple_connection_error:
    * @gc: the connection which is closing.
    * @reason: why the connection is closing.
    --- a/pidgin/gtkconn.c Tue Sep 20 01:31:47 2022 -0500
    +++ b/pidgin/gtkconn.c Tue Sep 20 01:34:26 2022 -0500
    @@ -164,14 +164,10 @@
    }
    }
    -static void pidgin_connection_notice(PurpleConnection *gc, const char *text)
    -{ }
    -
    static PurpleConnectionUiOps conn_ui_ops =
    {
    pidgin_connection_connected,
    pidgin_connection_disconnected,
    - pidgin_connection_notice,
    pidgin_connection_network_connected,
    pidgin_connection_network_disconnected,
    pidgin_connection_report_disconnect,