Rank Dialog: Cosmetic Improvements

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

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 6e2c42d7229f447f0301fd86752ec6478be21905..5d13ecd1ed21adff8bcf3abb3e57fd4bb98a23e0 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -48,36 +48,7 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-static void psppire_output_window_class_init    (PsppireOutputWindowClass *class);
-static void psppire_output_window_init          (PsppireOutputWindow      *window);
-
-GType
-psppire_output_window_get_type (void)
-{
-  static GType psppire_output_window_type = 0;
-
-  if (!psppire_output_window_type)
-    {
-      static const GTypeInfo psppire_output_window_info =
-      {
-       sizeof (PsppireOutputWindowClass),
-       (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-       (GClassInitFunc)psppire_output_window_class_init,
-       (GClassFinalizeFunc) NULL,
-       NULL,
-        sizeof (PsppireOutputWindow),
-       0,
-       (GInstanceInitFunc) psppire_output_window_init,
-      };
-
-      psppire_output_window_type =
-       g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireOutputWindow",
-                               &psppire_output_window_info, 0);
-    }
-
-  return psppire_output_window_type;
-}
+G_DEFINE_TYPE (PsppireOutputWindow, psppire_output_window, PSPPIRE_TYPE_WINDOW)
 
 static GObjectClass *parent_class;
 
@@ -266,7 +237,7 @@ enum
 
 #define N_EXTENSIONS (n_FT - 1)
 
-struct file_types ft[n_FT] = {
+static const struct file_types ft[n_FT] = {
   {N_("Infer file type from extension"),  NULL},
   {N_("SPSS Viewer (*.spv)"),             ".spv"},
   {N_("PDF (*.pdf)"),                     ".pdf"},
@@ -510,9 +481,6 @@ psppire_output_window_init (PsppireOutputWindow *window)
     GTK_LAYOUT (get_widget_assert (xml, "output")),
     GTK_TREE_VIEW (get_widget_assert (xml, "overview")));
 
-
-  connect_help (xml);
-
   g_signal_connect (window,
                    "focus-in-event",
                    G_CALLBACK (cancel_urgency),
@@ -535,7 +503,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
     g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (print));
 
 
-    const gchar *accels[2] = { "<Ctrl>P", NULL};
+    const gchar *accels[2] = { "<Primary>P", NULL};
     gtk_application_set_accels_for_action (app,
                                           "win.print",
                                           accels);
@@ -557,7 +525,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
     GSimpleAction *copy = g_simple_action_new ("copy", NULL);
     g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (copy));
 
-    const gchar *accels[2] = { "<Ctrl>C", NULL};
+    const gchar *accels[2] = { "<Primary>C", NULL};
     gtk_application_set_accels_for_action (app,
                                           "win.copy",
                                           accels);