From a59e807bb07bb2830bfc89e24fa48ef5d222a9a5 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 30 Jun 2022 14:25:57 -0700 Subject: [PATCH] gui: Fix icon names. Using icon-name "org.gnu.pspp" makes the window manager show the PSPP icon instead of a generic one. Reported by Friedrich Beckmann. --- src/ui/gui/psppire-data-window.c | 2 +- src/ui/gui/psppire-dialog.c | 2 +- src/ui/gui/psppire-import-assistant.c | 2 +- src/ui/gui/psppire-syntax-window.c | 2 +- src/ui/gui/psppire-window.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index ad7e9250f7..54f65d7747 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -625,7 +625,7 @@ confirm_delete_dataset (PsppireDataWindow *de, _("Delete"), GTK_RESPONSE_OK, NULL); - g_object_set (dialog, "icon-name", "pspp", NULL); + g_object_set (dialog, "icon-name", "org.gnu.pspp", NULL); result = gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 4dfa1cd45a..99f6d22824 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -237,7 +237,7 @@ psppire_dialog_init (PsppireDialog *dialog) gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - g_object_set (dialog, "icon-name", "pspp", NULL); + g_object_set (dialog, "icon-name", "org.gnu.pspp", NULL); } GtkWidget* diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c index 9e8ef8d371..472db49d6d 100644 --- a/src/ui/gui/psppire-import-assistant.c +++ b/src/ui/gui/psppire-import-assistant.c @@ -460,7 +460,7 @@ psppire_import_assistant_init (PsppireImportAssistant *ia) gtk_window_set_title (GTK_WINDOW (ia), _("Importing Delimited Text Data")); - gtk_window_set_icon_name (GTK_WINDOW (ia), "pspp"); + gtk_window_set_icon_name (GTK_WINDOW (ia), "org.gnu.pspp"); gtk_window_set_modal (GTK_WINDOW(ia), TRUE); chooser_page_create (ia); diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index c1f9e4631e..393c2afb5a 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -1023,7 +1023,7 @@ error_dialog (GtkWindow *w, const gchar *filename, GError *err) g_free (fn); - g_object_set (dialog, "icon-name", "pspp", NULL); + g_object_set (dialog, "icon-name", "org.gnu.pspp", NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", err->message); diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 1475398b03..60f265e443 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -394,7 +394,7 @@ psppire_window_init (PsppireWindow *window) g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window); - g_object_set (window, "icon-name", "pspp", NULL); + g_object_set (window, "icon-name", "org.gnu.pspp", NULL); } /* @@ -429,7 +429,7 @@ psppire_window_query_save (PsppireWindow *se) description); g_free (description); - g_object_set (dialog, "icon-name", "pspp", NULL); + g_object_set (dialog, "icon-name", "org.gnu.pspp", NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you don't save, changes from the last %ld seconds will be permanently lost."), -- 2.30.2