Oops. Add new file.

[pspp-builds.git] / 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 a5cc08aa93b9a711f84cca75894cef2b013b2ee4..053dc227f0a733f40db3208d16d7aef4495b3bdc 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -552,6 +552,30 @@ psppire_syntax_window_new (void)
                                   NULL));
 }
 
+static void
+error_dialog (GtkWindow *w, const gchar *filename,  GError *err)
+{
+  gchar *fn = g_filename_display_basename (filename);
+
+  GtkWidget *dialog =
+    gtk_message_dialog_new (w,
+                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                           GTK_MESSAGE_ERROR,
+                           GTK_BUTTONS_CLOSE,
+                           _("Cannot load syntax file '%s'"),
+                           fn);
+
+  g_free (fn);
+
+  g_object_set (dialog, "icon-name", "psppicon", NULL);
+
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                           err->message);
+
+  gtk_dialog_run (GTK_DIALOG (dialog));
+
+  gtk_widget_destroy (dialog);
+}
 
 /*
   Loads the buffer from the file called FILENAME
@@ -559,30 +583,23 @@ psppire_syntax_window_new (void)
 static gboolean
 syntax_load (PsppireWindow *window, const gchar *filename)
 {
+  GError *err = NULL;
   gchar *text;
   GtkTextIter iter;
   PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window);
 
-  gchar *glibfilename = g_filename_from_utf8 (filename, -1, 0, 0, NULL);
-
-  if ( ! glibfilename )
-    return FALSE;
-
   /* FIXME: What if it's a very big file ? */
-  if ( ! g_file_get_contents (glibfilename, &text, NULL, NULL) )
+  if ( ! g_file_get_contents (filename, &text, NULL, &err) )
     {
-      g_free (glibfilename);
+      error_dialog (GTK_WINDOW (window), filename, err);
+      g_clear_error (&err);
       return FALSE;
     }
 
-  g_free (glibfilename);
-
   gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0);
 
   gtk_text_buffer_insert (sw->buffer, &iter, text, -1);
 
-  psppire_window_set_filename (window, filename);
-
   gtk_text_buffer_set_modified (sw->buffer, FALSE);
 
   return TRUE;