src/ui/gui/psppire-conf.c: Use GError instead of strerror.

[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 3fecfad26a5ddcdd089fa7e4bf1e8ff847d10199..eebaac5b28dda4c18b7791496875fcd4648e765b 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -111,19 +111,20 @@ psppire_syntax_window_get_type (void)
       static const GTypeInfo psppire_syntax_window_info =
       {
        sizeof (PsppireSyntaxWindowClass),
-       (GBaseInitFunc) psppire_syntax_window_base_init,
-        (GBaseFinalizeFunc) psppire_syntax_window_base_finalize,
-       (GClassInitFunc)psppire_syntax_window_class_init,
+       (GBaseInitFunc) (void (*)(void)) psppire_syntax_window_base_init,
+        (GBaseFinalizeFunc) (void (*)(void)) psppire_syntax_window_base_finalize,
+       (GClassInitFunc) (void (*)(void)) psppire_syntax_window_class_init,
        (GClassFinalizeFunc) NULL,
        NULL,
         sizeof (PsppireSyntaxWindow),
        0,
-       (GInstanceInitFunc) psppire_syntax_window_init,
+       (GInstanceInitFunc) (void (*)(void)) psppire_syntax_window_init,
+       NULL /* value_table */
       };
 
       static const GInterfaceInfo window_interface_info =
        {
-         (GInterfaceInitFunc) psppire_syntax_window_iface_init,
+         (GInterfaceInitFunc) (void (*)(void)) psppire_syntax_window_iface_init,
          NULL,
          NULL
        };
@@ -391,17 +392,22 @@ clipboard_clear_cb (GtkClipboard *clipboard,
   sw->cliptext = NULL;
 }
 
+static gchar tn1[] = "UTF8_STRING";
+static gchar tn2[] = "STRING";
+static gchar tn3[] = "TEXT";
+static gchar tn4[] = "COMPOUND_TEXT";
+static gchar tn5[] = "text/plain;charset=utf-8";
+static gchar tn6[] = "text/plain";
 
 static const GtkTargetEntry targets[] = {
-  { "UTF8_STRING",   0, SELECT_FMT_TEXT },
-  { "STRING",        0, SELECT_FMT_TEXT },
-  { "TEXT",          0, SELECT_FMT_TEXT },
-  { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
-  { "text/plain;charset=utf-8", 0, SELECT_FMT_TEXT },
-  { "text/plain",    0, SELECT_FMT_TEXT },
+  { tn1, 0, SELECT_FMT_TEXT },
+  { tn2, 0, SELECT_FMT_TEXT },
+  { tn3, 0, SELECT_FMT_TEXT },
+  { tn4, 0, SELECT_FMT_TEXT },
+  { tn5, 0, SELECT_FMT_TEXT },
+  { tn6, 0, SELECT_FMT_TEXT }
 };
 
-
 /*
   Store a clip containing the currently selected text.
   Returns true iff something was set.
@@ -869,8 +875,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
   window->ps_handler = g_signal_connect (clip_selection, "owner-change",
                                          G_CALLBACK (set_paste_sensitivity), window);
 
-  connect_help (xml);
-
   gtk_container_add (GTK_CONTAINER (window), box);
 
   g_object_ref (sw);
@@ -906,7 +910,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
                              G_CALLBACK (psppire_window_save),
                              window);
 
-    const gchar *accels[2] = { "<Ctrl>S", NULL};
+    const gchar *accels[2] = { "<Primary>S", NULL};
     gtk_application_set_accels_for_action (app,
                                           "win.save",
                                           accels);
@@ -924,7 +928,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
                              window);
 
 
-    const gchar *accels[2] = { "<Shift><Ctrl>S", NULL};
+    const gchar *accels[2] = { "<Shift><Primary>S", NULL};
     gtk_application_set_accels_for_action (app,
                                           "win.save_as",
                                           accels);
@@ -976,7 +980,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
     g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_current_line));
 
     GtkApplication *app = GTK_APPLICATION (g_application_get_default ());
-    const gchar *accels[2] = { "<Ctrl>R", NULL};
+    const gchar *accels[2] = { "<Primary>R", NULL};
     gtk_application_set_accels_for_action (app,
                                           "win.run-current-line",
                                           accels);
@@ -1055,7 +1059,7 @@ error_dialog (GtkWindow *w, const gchar *filename,  GError *err)
 /*
   Loads the buffer from the file called FILENAME
 */
-gboolean
+static gboolean
 syntax_load (PsppireWindow *window, const gchar *filename,
              const gchar *encoding, gpointer not_used)
 {