X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=66838dd307172943d0a59fd26097013192d8e6c4;hb=65dea0d51ec33cbc614a3ec87b5aae28c86f005a;hp=ca047560696b40ad9d5fc77b8086ac5b72c695f2;hpb=feddb0d0be4cd39cca437cab738140c9db3dd0b6;p=pspp

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index ca04756069..66838dd307 100644
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -296,7 +296,7 @@ clipboard_get_cb (GtkClipboard     *clipboard,
   PsppireSyntaxWindow *sw = data;
   g_assert (info == SELECT_FMT_TEXT);
 
-  gtk_selection_data_set (selection_data, selection_data->target,
+  gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data),
 			  8,
 			  (const guchar *) sw->cliptext, strlen (sw->cliptext));
 
@@ -369,7 +369,6 @@ on_edit_copy (PsppireSyntaxWindow *sw)
   set_clip (sw, &begin, &end);
 }
 
-
 static void
 on_edit_paste (PsppireSyntaxWindow *sw)
 {
@@ -566,8 +565,8 @@ syntax_pick_filename (PsppireWindow *window)
     gtk_file_chooser_dialog_new (_("Save Syntax"),
 				 GTK_WINDOW (se),
 				 GTK_FILE_CHOOSER_ACTION_SAVE,
-				 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				 GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
+				 _("Cancel"), GTK_RESPONSE_CANCEL,
+				 _("Save"),   GTK_RESPONSE_ACCEPT,
 				 NULL);
 
   g_object_set (dialog, "local-only", FALSE, NULL);
@@ -698,7 +697,7 @@ static void
 psppire_syntax_window_init (PsppireSyntaxWindow *window)
 {
   GtkBuilder *xml = builder_new ("syntax-editor.ui");
-  GtkWidget *box = gtk_vbox_new (FALSE, 0);
+  GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
   GtkWidget *menubar = get_widget_assert (xml, "menubar");
   GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8");
@@ -865,16 +864,13 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
 		    G_CALLBACK (psppire_window_minimise_all), NULL);
 
 
-
-
-
   {
-  GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
+    GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
+    GtkWidget *w = gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all");
 
-  merge_help_menu (uim);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menubar),  create_help_menu (GTK_WINDOW (window)));
 
-  PSPPIRE_WINDOW (window)->menu =
-    GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
+    PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w));
   }
 
   g_object_unref (xml);