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.

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index ad7e9250f7d404389aefaa0e79bf55e23d2f32d3..54f65d7747a01fe32c8a68b50081b9c5368945ca 100644 (file)
--- 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 4dfa1cd45a42af8b83ff6ffacc7838661f7141ad..99f6d228249f0bc5ca97dcf9b221c282edefd8b2 100644 (file)
--- 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 9e8ef8d3715453d6fad03f438c8a66823734fd34..472db49d6d5f06b65c6988e8e4b4d012e8b85bf8 100644 (file)
--- 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 c1f9e4631e63a19442353a2129acf8a8aaeb386c..393c2afb5a0d966f3c5d8824601e760a73b4a709 100644 (file)
--- 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 1475398b03b6725bb3bb162e48610f1410914460..60f265e4437a85a3feebdfc599091d2a8e702207 100644 (file)
--- 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."),