# HG changeset patch # User Elliott Sales de Andrade # Date 1661229344 18000 # Node ID 750d7d2581fed0dd830527cc4fb8e1fe58e2cde3 # Parent 5a7a4bb5bfd469825764e315fb34e6279cdcccc6 Port notifications to GTK4 Testing Done: Compiled, and opened notifications window, eventually. Reviewed at https://reviews.imfreedom.org/r/1622/ diff -r 5a7a4bb5bfd4 -r 750d7d2581fe pidgin/pidginnotificationauthorizationrequest.c --- a/pidgin/pidginnotificationauthorizationrequest.c Mon Aug 22 21:43:13 2022 -0500 +++ b/pidgin/pidginnotificationauthorizationrequest.c Mon Aug 22 23:35:44 2022 -0500 @@ -29,7 +29,7 @@ #include "pidgin/gtkdialogs.h" struct _PidginNotificationAuthorizationRequest { - HdyActionRow parent; + AdwActionRow parent; PurpleNotification *notification; @@ -46,7 +46,7 @@ static GParamSpec *properties[N_PROPERTIES] = { NULL, }; G_DEFINE_TYPE(PidginNotificationAuthorizationRequest, - pidgin_notification_authorization_request, HDY_TYPE_ACTION_ROW) + pidgin_notification_authorization_request, ADW_TYPE_ACTION_ROW) /****************************************************************************** * Helpers @@ -61,11 +61,11 @@ g_return_if_fail(PIDGIN_IS_NOTIFICATION_AUTHORIZATION_REQUEST(request)); if(!PURPLE_IS_NOTIFICATION(request->notification)) { - hdy_preferences_row_set_title(HDY_PREFERENCES_ROW(request), + adw_preferences_row_set_title(ADW_PREFERENCES_ROW(request), _("Notification missing")); - hdy_action_row_set_icon_name(HDY_ACTION_ROW(request), NULL); - hdy_action_row_set_subtitle(HDY_ACTION_ROW(request), NULL); + adw_action_row_set_icon_name(ADW_ACTION_ROW(request), NULL); + adw_action_row_set_subtitle(ADW_ACTION_ROW(request), NULL); gtk_widget_hide(request->accept); gtk_widget_hide(request->deny); @@ -76,11 +76,11 @@ account = purple_notification_get_account(request->notification); if(!PURPLE_IS_ACCOUNT(account)) { - hdy_preferences_row_set_title(HDY_PREFERENCES_ROW(request), + adw_preferences_row_set_title(ADW_PREFERENCES_ROW(request), _("Notification is missing an account")); - hdy_action_row_set_icon_name(HDY_ACTION_ROW(request), NULL); - hdy_action_row_set_subtitle(HDY_ACTION_ROW(request), NULL); + adw_action_row_set_icon_name(ADW_ACTION_ROW(request), NULL); + adw_action_row_set_subtitle(ADW_ACTION_ROW(request), NULL); gtk_widget_hide(request->accept); gtk_widget_hide(request->deny); @@ -103,13 +103,13 @@ icon_name = "dialog-question"; } } - hdy_action_row_set_icon_name(HDY_ACTION_ROW(request), icon_name); + adw_action_row_set_icon_name(ADW_ACTION_ROW(request), icon_name); title = purple_notification_get_title(request->notification); - hdy_preferences_row_set_title(HDY_PREFERENCES_ROW(request), title); + adw_preferences_row_set_title(ADW_PREFERENCES_ROW(request), title); message = purple_authorization_request_get_message(purple_request); - hdy_action_row_set_subtitle(HDY_ACTION_ROW(request), message); + adw_action_row_set_subtitle(ADW_ACTION_ROW(request), message); gtk_widget_show(request->accept); gtk_widget_show(request->deny); diff -r 5a7a4bb5bfd4 -r 750d7d2581fe pidgin/pidginnotificationauthorizationrequest.h --- a/pidgin/pidginnotificationauthorizationrequest.h Mon Aug 22 21:43:13 2022 -0500 +++ b/pidgin/pidginnotificationauthorizationrequest.h Mon Aug 22 23:35:44 2022 -0500 @@ -31,7 +31,7 @@ #include -#include +#include #include @@ -49,7 +49,7 @@ #define PIDGIN_TYPE_NOTIFICATION_AUTHORIZATION_REQUEST (pidgin_notification_authorization_request_get_type()) G_DECLARE_FINAL_TYPE(PidginNotificationAuthorizationRequest, pidgin_notification_authorization_request, - PIDGIN, NOTIFICATION_AUTHORIZATION_REQUEST, HdyActionRow) + PIDGIN, NOTIFICATION_AUTHORIZATION_REQUEST, AdwActionRow) /** * pidgin_notification_authorization_request_new: diff -r 5a7a4bb5bfd4 -r 750d7d2581fe pidgin/resources/Notifications/authorizationrequest.ui --- a/pidgin/resources/Notifications/authorizationrequest.ui Mon Aug 22 21:43:13 2022 -0500 +++ b/pidgin/resources/Notifications/authorizationrequest.ui Mon Aug 22 23:35:44 2022 -0500 @@ -19,24 +19,22 @@ --> - - + + -