pidgin/pidgin

Migrate away from AdwActionRow:icon-name

13 months ago, Elliott Sales de Andrade
ce5c1634c6a1
Parents 1927694accdb
Children 2e49acd1c587
Migrate away from AdwActionRow:icon-name

This is deprecated in Adwaita 1.3

Testing Done:
Triggered connection error and buddy request in Demo protocol; not sure how to check authorization.

Reviewed at https://reviews.imfreedom.org/r/2410/
7 files changed, 50 insertions(+), 11 deletions(-)
  • +7 -3
    pidgin/pidginnotificationaddcontact.c
  • +7 -3
    pidgin/pidginnotificationauthorizationrequest.c
  • +7 -3
    pidgin/pidginnotificationconnectionerror.c
  • +8 -2
    pidgin/pidginnotificationlist.c
  • +7 -0
    pidgin/resources/Notifications/addcontact.ui
  • +7 -0
    pidgin/resources/Notifications/authorizationrequest.ui
  • +7 -0
    pidgin/resources/Notifications/connectionerror.ui
    • --- a/pidgin/pidginnotificationaddcontact.c Thu Mar 30 22:58:43 2023 -0500
    +++ b/pidgin/pidginnotificationaddcontact.c Fri Mar 31 00:40:44 2023 -0500
    @@ -33,6 +33,7 @@
    PurpleNotification *notification;
    + GtkWidget *icon;
    GtkWidget *add;
    GtkWidget *message;
    };
    @@ -64,7 +65,7 @@
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(add_contact),
    _("Notification missing"));
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(add_contact), NULL);
    + gtk_image_set_from_icon_name(GTK_IMAGE(add_contact->icon), NULL);
    adw_action_row_set_subtitle(ADW_ACTION_ROW(add_contact), NULL);
    gtk_widget_hide(add_contact->add);
    @@ -78,7 +79,7 @@
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(add_contact),
    _("Notification is missing an account"));
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(add_contact), NULL);
    + gtk_image_set_from_icon_name(GTK_IMAGE(add_contact->icon), NULL);
    adw_action_row_set_subtitle(ADW_ACTION_ROW(add_contact), NULL);
    gtk_widget_hide(add_contact->add);
    @@ -101,7 +102,7 @@
    icon_name = "dialog-question";
    }
    }
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(add_contact), icon_name);
    + gtk_image_set_from_icon_name(GTK_IMAGE(add_contact->icon), icon_name);
    title = purple_notification_get_title(add_contact->notification);
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(add_contact), title);
    @@ -269,6 +270,9 @@
    gtk_widget_class_bind_template_child(widget_class,
    PidginNotificationAddContact,
    + icon);
    + gtk_widget_class_bind_template_child(widget_class,
    + PidginNotificationAddContact,
    add);
    gtk_widget_class_bind_template_child(widget_class,
    PidginNotificationAddContact,
    --- a/pidgin/pidginnotificationauthorizationrequest.c Thu Mar 30 22:58:43 2023 -0500
    +++ b/pidgin/pidginnotificationauthorizationrequest.c Fri Mar 31 00:40:44 2023 -0500
    @@ -33,6 +33,7 @@
    PurpleNotification *notification;
    + GtkWidget *icon;
    GtkWidget *accept;
    GtkWidget *deny;
    GtkWidget *message;
    @@ -64,7 +65,7 @@
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(request),
    _("Notification missing"));
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(request), NULL);
    + gtk_image_set_from_icon_name(GTK_IMAGE(request->icon), NULL);
    adw_action_row_set_subtitle(ADW_ACTION_ROW(request), NULL);
    gtk_widget_hide(request->accept);
    @@ -79,7 +80,7 @@
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(request),
    _("Notification is missing an account"));
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(request), NULL);
    + gtk_image_set_from_icon_name(GTK_IMAGE(request->icon), NULL);
    adw_action_row_set_subtitle(ADW_ACTION_ROW(request), NULL);
    gtk_widget_hide(request->accept);
    @@ -103,7 +104,7 @@
    icon_name = "dialog-question";
    }
    }
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(request), icon_name);
    + gtk_image_set_from_icon_name(GTK_IMAGE(request->icon), icon_name);
    title = purple_notification_get_title(request->notification);
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(request), title);
    @@ -300,6 +301,9 @@
    gtk_widget_class_bind_template_child(widget_class,
    PidginNotificationAuthorizationRequest,
    + icon);
    + gtk_widget_class_bind_template_child(widget_class,
    + PidginNotificationAuthorizationRequest,
    accept);
    gtk_widget_class_bind_template_child(widget_class,
    PidginNotificationAuthorizationRequest,
    --- a/pidgin/pidginnotificationconnectionerror.c Thu Mar 30 22:58:43 2023 -0500
    +++ b/pidgin/pidginnotificationconnectionerror.c Fri Mar 31 00:40:44 2023 -0500
    @@ -31,6 +31,7 @@
    PurpleNotification *notification;
    + GtkWidget *icon;
    GtkWidget *reconnect;
    GtkWidget *reenable;
    GtkWidget *modify;
    @@ -62,7 +63,7 @@
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(error),
    _("Notification missing"));
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(error), NULL);
    + gtk_image_set_from_icon_name(GTK_IMAGE(error->icon), NULL);
    adw_action_row_set_subtitle(ADW_ACTION_ROW(error), NULL);
    gtk_widget_hide(error->reconnect);
    @@ -77,7 +78,7 @@
    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(error),
    _("Notification is missing an account"));
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(error), NULL);
    + gtk_image_set_from_icon_name(GTK_IMAGE(error->icon), NULL);
    adw_action_row_set_subtitle(ADW_ACTION_ROW(error), NULL);
    gtk_widget_hide(error->reconnect);
    @@ -99,7 +100,7 @@
    /* Set the icon name if one was specified. */
    icon_name = purple_notification_get_icon_name(error->notification);
    if(icon_name != NULL) {
    - adw_action_row_set_icon_name(ADW_ACTION_ROW(error), icon_name);
    + gtk_image_set_from_icon_name(GTK_IMAGE(error->icon), icon_name);
    }
    enabled = purple_account_get_enabled(account);
    @@ -240,6 +241,9 @@
    gtk_widget_class_bind_template_child(widget_class,
    PidginNotificationConnectionError,
    + icon);
    + gtk_widget_class_bind_template_child(widget_class,
    + PidginNotificationConnectionError,
    reconnect);
    gtk_widget_class_bind_template_child(widget_class,
    PidginNotificationConnectionError,
    --- a/pidgin/pidginnotificationlist.c Thu Mar 30 22:58:43 2023 -0500
    +++ b/pidgin/pidginnotificationlist.c Fri Mar 31 00:40:44 2023 -0500
    @@ -78,12 +78,18 @@
    static GtkWidget *
    pidgin_notification_generic_new(PurpleNotification *notification) {
    GtkWidget *row = NULL;
    + GtkWidget *icon = NULL;
    +
    + icon = gtk_image_new();
    + gtk_image_set_icon_size(GTK_IMAGE(icon), GTK_ICON_SIZE_LARGE);
    + g_object_bind_property(notification, "icon-name", icon, "icon-name",
    + G_BINDING_SYNC_CREATE);
    row = adw_action_row_new();
    + adw_action_row_add_prefix(ADW_ACTION_ROW(row), icon);
    +
    g_object_bind_property(notification, "title", row, "title",
    G_BINDING_SYNC_CREATE);
    - g_object_bind_property(notification, "icon-name", row, "icon-name",
    - G_BINDING_SYNC_CREATE);
    g_object_bind_property_full(notification, "data", row, "subtitle",
    G_BINDING_SYNC_CREATE,
    pidgin_notification_gpointer_to_char,
    --- a/pidgin/resources/Notifications/addcontact.ui Thu Mar 30 22:58:43 2023 -0500
    +++ b/pidgin/resources/Notifications/addcontact.ui Fri Mar 31 00:40:44 2023 -0500
    @@ -30,6 +30,13 @@
    <property name="activatable">0</property>
    <property name="title-lines">3</property>
    <property name="subtitle-lines">3</property>
    + <child type="prefix">
    + <object class="GtkImage" id="icon">
    + <property name="icon-size">large</property>
    + <property name="halign">center</property>
    + <property name="valign">center</property>
    + </object>
    + </child>
    <child>
    <object class="GtkButton" id="add">
    <property name="label" translatable="1">Add</property>
    --- a/pidgin/resources/Notifications/authorizationrequest.ui Thu Mar 30 22:58:43 2023 -0500
    +++ b/pidgin/resources/Notifications/authorizationrequest.ui Fri Mar 31 00:40:44 2023 -0500
    @@ -30,6 +30,13 @@
    <property name="activatable">0</property>
    <property name="title-lines">3</property>
    <property name="subtitle-lines">3</property>
    + <child type="prefix">
    + <object class="GtkImage" id="icon">
    + <property name="icon-size">large</property>
    + <property name="halign">center</property>
    + <property name="valign">center</property>
    + </object>
    + </child>
    <child>
    <object class="GtkButton" id="accept">
    <property name="label" translatable="1">Accept</property>
    --- a/pidgin/resources/Notifications/connectionerror.ui Thu Mar 30 22:58:43 2023 -0500
    +++ b/pidgin/resources/Notifications/connectionerror.ui Fri Mar 31 00:40:44 2023 -0500
    @@ -27,6 +27,13 @@
    <property name="focusable">1</property>
    <property name="activatable">0</property>
    <property name="subtitle-lines">3</property>
    + <child type="prefix">
    + <object class="GtkImage" id="icon">
    + <property name="icon-size">large</property>
    + <property name="halign">center</property>
    + <property name="valign">center</property>
    + </object>
    + </child>
    <child>
    <object class="GtkButton" id="reconnect">
    <property name="label" translatable="1">Reconnect</property>