gui: Fix icon names.

[pspp] / src / ui / gui / psppire-syntax-window.c

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 6a84318ab56143f29b6dac35822e537ef173c667..393c2afb5a0d966f3c5d8824601e760a73b4a709 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -200,7 +200,11 @@ editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start,
   struct lex_reader *reader = lex_reader_for_gtk_text_buffer (
     GTK_TEXT_BUFFER (sw->buffer), start, stop, sw->syntax_mode);
 
-  lex_reader_set_file_name (reader, psppire_window_get_filename (win));
+  const gchar *filename = psppire_window_get_filename (win);
+  /* TRANSLATORS: This is part of a filename.  Please avoid whitespace. */
+  gchar *untitled = xasprintf ("%s.sps", _("Untitled"));
+  lex_reader_set_file_name (reader, filename ? filename : untitled);
+  free (untitled);
 
   execute_syntax (psppire_default_data_window (), reader);
 }
@@ -523,11 +527,11 @@ on_syntax (GAction *action, GVariant *param, PsppireSyntaxWindow *sw)
 
   const gchar *what = g_variant_get_string (new_state, NULL);
   if (0 == g_strcmp0 (what, "auto"))
-    sw->syntax_mode = LEX_SYNTAX_AUTO;
+    sw->syntax_mode = SEG_MODE_AUTO;
   else if (0 == g_strcmp0 (what, "interactive"))
-    sw->syntax_mode = LEX_SYNTAX_INTERACTIVE;
+    sw->syntax_mode = SEG_MODE_INTERACTIVE;
   else if (0 == g_strcmp0 (what, "batch"))
-    sw->syntax_mode = LEX_SYNTAX_BATCH;
+    sw->syntax_mode = SEG_MODE_BATCH;
   else
     g_warn_if_reached ();
 }
@@ -779,7 +783,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
                NULL);
 
   window->encoding = NULL;
-  window->syntax_mode = LEX_SYNTAX_AUTO;
+  window->syntax_mode = SEG_MODE_AUTO;
 
   window->cliptext = NULL;
   window->dispose_has_run = FALSE;
@@ -1019,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);