# HG changeset patch # User Elliott Sales de Andrade # Date 1661484718 18000 # Node ID 61d8f39f3d708242500bab63ae096c3f94b58cb1 # Parent 30ad4d17661fa01475913898b191989850bac3e2 Port about dialog to GTK4 Testing Done: Opened the dialog, clicked the various options. There is currently a warning about `markdown_link_target`, but that seems to be a bug in Talkatu (and the links all mush together, which I think is the same problem.) Also, strangely, the dialog sometimes opens exactly as wide as the bottom button box, but sometimes it opens a little bit wider (not sure if it's also Talkatu wrapping causing minor size request changes, or something else). Reviewed at https://reviews.imfreedom.org/r/1649/ diff -r 30ad4d17661f -r 61d8f39f3d70 pidgin/pidginabout.c --- a/pidgin/pidginabout.c Thu Aug 25 22:30:30 2022 -0500 +++ b/pidgin/pidginabout.c Thu Aug 25 22:31:58 2022 -0500 @@ -324,9 +324,9 @@ GtkTreeIter section, iter; gchar *markup = NULL; gchar *cursor_theme_name = NULL, *theme_name = NULL; - gchar *icon_theme_name = NULL, *fallback_icon_theme = NULL; + gchar *icon_theme_name = NULL; gchar *im_module = NULL; - gchar *key_theme_name = NULL, *sound_theme_name = NULL; + gchar *sound_theme_name = NULL; gboolean enable_animations = FALSE; gboolean shell_shows_app_menu = FALSE, shell_shows_menubar = FALSE; @@ -343,10 +343,8 @@ gtk_settings_get_default(), "gtk-cursor-theme-name", &cursor_theme_name, "gtk-enable-animations", &enable_animations, - "gtk-fallback-icon-theme", &fallback_icon_theme, "gtk-icon-theme-name", &icon_theme_name, "gtk-im-module", &im_module, - "gtk-key-theme-name", &key_theme_name, "gtk-shell-shows-app-menu", &shell_shows_app_menu, "gtk-shell-shows-menubar", &shell_shows_menubar, "gtk-sound-theme-name", &sound_theme_name, @@ -367,12 +365,6 @@ gtk_tree_store_append(about->build_info_store, &iter, §ion); gtk_tree_store_set(about->build_info_store, &iter, - 0, "gtk-fallback-icon-theme", - 1, (fallback_icon_theme != NULL) ? fallback_icon_theme : _("(not set)"), - -1); - - gtk_tree_store_append(about->build_info_store, &iter, §ion); - gtk_tree_store_set(about->build_info_store, &iter, 0, "gtk-icon-theme-name", 1, (icon_theme_name != NULL) ? icon_theme_name : _("(not set)"), -1); @@ -385,12 +377,6 @@ gtk_tree_store_append(about->build_info_store, &iter, §ion); gtk_tree_store_set(about->build_info_store, &iter, - 0, "gtk-key-theme-name", - 1, (key_theme_name != NULL) ? key_theme_name : _("(not set)"), - -1); - - gtk_tree_store_append(about->build_info_store, &iter, §ion); - gtk_tree_store_set(about->build_info_store, &iter, 0, "gtk-shell-shows-app-menu", 1, shell_shows_app_menu ? _("yes") : _("no"), -1); @@ -414,10 +400,8 @@ -1); g_free(cursor_theme_name); - g_free(fallback_icon_theme); g_free(icon_theme_name); g_free(im_module); - g_free(key_theme_name); g_free(sound_theme_name); g_free(theme_name); } @@ -444,7 +428,7 @@ gtk_tree_store_append(about->build_info_store, &iter, §ion); gtk_tree_store_set(about->build_info_store, &iter, - 0, (gchar*)(paths->data), + 1, (gchar*)(paths->data), -1); paths = paths->next; @@ -512,6 +496,7 @@ { switch(response_id) { case GTK_RESPONSE_CLOSE: + case GTK_RESPONSE_DELETE_EVENT: gtk_window_destroy(GTK_WINDOW(dialog)); break; } diff -r 30ad4d17661f -r 61d8f39f3d70 pidgin/resources/About/about.ui --- a/pidgin/resources/About/about.ui Thu Aug 25 22:30:30 2022 -0500 +++ b/pidgin/resources/About/about.ui Thu Aug 25 22:31:58 2022 -0500 @@ -20,7 +20,7 @@ --> - + @@ -42,10 +42,7 @@ -