pidgin/pidgin

Replace obsolete delete_event signals

16 months ago, Elliott Sales de Andrade
b6a9fcf02157
Parents 5634642aca06
Children c3ebebdf879a
Replace obsolete delete_event signals

We can use `response` on dialogs or `destroy` on windows.

Also, using `response` means we don't need to _also_ connect to `clicked` on action buttons.

Testing Done:
Compiled and opened 'Get Buddy Info' then closed with titlebar button and Close button, and confirmed that callback was triggered. No tests for the other UI.

Reviewed at https://reviews.imfreedom.org/r/2189/
3 files changed, 18 insertions(+), 28 deletions(-)
  • +14 -21
    pidgin/gtknotify.c
  • +3 -6
    pidgin/gtkwhiteboard.c
  • +1 -1
    pidgin/resources/Whiteboard/whiteboard.ui
    • --- a/pidgin/gtknotify.c Fri Jan 13 01:12:30 2023 -0600
    +++ b/pidgin/gtknotify.c Sun Jan 15 21:27:10 2023 -0600
    @@ -64,21 +64,20 @@
    purple_notify_close(PURPLE_NOTIFY_MESSAGE, widget);
    }
    -static gboolean
    -formatted_close_cb(GtkWidget *win, G_GNUC_UNUSED GdkEvent *event,
    +static void
    +formatted_close_cb(GtkDialog *dialog, G_GNUC_UNUSED gint response,
    G_GNUC_UNUSED gpointer user_data)
    {
    - purple_notify_close(PURPLE_NOTIFY_FORMATTED, win);
    - return FALSE;
    + purple_notify_close(PURPLE_NOTIFY_FORMATTED, dialog);
    }
    -static gboolean
    -searchresults_close_cb(PidginNotifySearchResultsData *data,
    - G_GNUC_UNUSED GdkEvent *event,
    - G_GNUC_UNUSED gpointer user_data)
    +static void
    +searchresults_close_cb(G_GNUC_UNUSED GtkDialog *dialog,
    + G_GNUC_UNUSED gint response,
    + gpointer user_data)
    {
    + PidginNotifySearchResultsData *data = user_data;
    purple_notify_close(PURPLE_NOTIFY_SEARCHRESULTS, data);
    - return FALSE;
    }
    static void
    @@ -262,8 +261,7 @@
    gtk_window_set_title(GTK_WINDOW(window), title);
    gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
    - g_signal_connect(G_OBJECT(window), "delete_event",
    - G_CALLBACK(formatted_close_cb), NULL);
    + g_signal_connect(window, "response", G_CALLBACK(formatted_close_cb), NULL);
    /* Setup the main vbox */
    vbox = gtk_dialog_get_content_area(GTK_DIALOG(window));
    @@ -303,8 +301,6 @@
    button = gtk_dialog_add_button(GTK_DIALOG(window), _("Close"), GTK_RESPONSE_CLOSE);
    gtk_widget_grab_focus(button);
    - g_signal_connect_swapped(G_OBJECT(button), "clicked",
    - G_CALLBACK(formatted_close_cb), window);
    event = gtk_event_controller_key_new();
    gtk_widget_add_controller(window, event);
    g_signal_connect(G_OBJECT(event), "key-pressed",
    @@ -367,7 +363,6 @@
    {
    GtkWidget *window;
    GtkWidget *treeview;
    - GtkWidget *close_button;
    GType *col_types;
    GtkListStore *model;
    GtkCellRenderer *renderer;
    @@ -395,8 +390,8 @@
    gtk_window_set_title(GTK_WINDOW(window), title ? title :_("Search Results"));
    gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
    - g_signal_connect_swapped(G_OBJECT(window), "delete_event",
    - G_CALLBACK(searchresults_close_cb), data);
    + g_signal_connect(window, "response", G_CALLBACK(searchresults_close_cb),
    + data);
    /* Setup the main vbox */
    vbox = gtk_dialog_get_content_area(GTK_DIALOG(window));
    @@ -511,10 +506,7 @@
    }
    /* Add the Close button */
    - close_button = gtk_dialog_add_button(GTK_DIALOG(window), _("Close"), GTK_RESPONSE_CLOSE);
    -
    - g_signal_connect_swapped(G_OBJECT(close_button), "clicked",
    - G_CALLBACK(searchresults_close_cb), data);
    + gtk_dialog_add_button(GTK_DIALOG(window), _("Close"), GTK_RESPONSE_CLOSE);
    data->account = purple_connection_get_account(gc);
    data->model = model;
    @@ -584,7 +576,8 @@
    char *primary = g_strdup_printf(_("Info for %s"), who);
    ui_handle = pidgin_notify_formatted(_("Buddy Information"), primary, NULL, info);
    g_signal_handlers_disconnect_by_func(G_OBJECT(ui_handle), G_CALLBACK(formatted_close_cb), NULL);
    - g_signal_connect(G_OBJECT(ui_handle), "destroy", G_CALLBACK(remove_userinfo), key);
    + g_signal_connect(ui_handle, "response", G_CALLBACK(remove_userinfo),
    + key);
    g_free(primary);
    pinfo = g_new0(PidginUserInfo, 1);
    pinfo->window = ui_handle;
    --- a/pidgin/gtkwhiteboard.c Fri Jan 13 01:12:30 2023 -0600
    +++ b/pidgin/gtkwhiteboard.c Sun Jan 15 21:27:10 2023 -0600
    @@ -93,15 +93,12 @@
    color->alpha = 1.0f;
    }
    -static gboolean
    -whiteboard_close_cb(GtkWidget *widget, G_GNUC_UNUSED GdkEvent *event,
    - G_GNUC_UNUSED gpointer data)
    +static void
    +whiteboard_destroy_cb(GtkWidget *widget, G_GNUC_UNUSED gpointer data)
    {
    PidginWhiteboard *gtkwb = PIDGIN_WHITEBOARD(widget);
    g_clear_object(&gtkwb->wb);
    -
    - return FALSE;
    }
    static void
    @@ -571,7 +568,7 @@
    color_button);
    gtk_widget_class_bind_template_callback(
    - widget_class, whiteboard_close_cb);
    + widget_class, whiteboard_destroy_cb);
    gtk_widget_class_bind_template_callback(
    widget_class, pidgin_whiteboard_draw_event);
    gtk_widget_class_bind_template_callback(
    --- a/pidgin/resources/Whiteboard/whiteboard.ui Fri Jan 13 01:12:30 2023 -0600
    +++ b/pidgin/resources/Whiteboard/whiteboard.ui Sun Jan 15 21:27:10 2023 -0600
    @@ -26,7 +26,7 @@
    <template class="PidginWhiteboard" parent="GtkWindow">
    <property name="title" translatable="yes">Pidgin Whiteboard</property>
    <property name="resizable">0</property>
    - <signal name="delete-event" handler="whiteboard_close_cb" swapped="no"/>
    + <signal name="destroy" handler="whiteboard_destroy_cb" swapped="no"/>
    <property name="child">
    <object class="GtkBox">
    <property name="spacing">6</property>