X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=f76b86dbfe264a45ad99d8a025964769ba15479e;hb=5b2ed095a8aaa98adaea4922855edcbfb619c728;hp=3fecfad26a5ddcdd089fa7e4bf1e8ff847d10199;hpb=3afd76608320f7fb890b166fcb3945e2c377a99f;p=pspp

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 3fecfad26a..f76b86dbfe 100644
--- 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
 	};
@@ -869,8 +870,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 +905,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 +923,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 +975,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);