X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=86d1db7664f7dc8f19a516f3f7333f2d5dd14823;hb=51c3424bf88d0fa110683fbcdd208d0fa5c98179;hp=77d20ab2bb3860c65114eda1b367d95772dfd235;hpb=b6088c04a2380078af7ce9c18b6ba52a0f6b38cf;p=pspp

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 77d20ab2bb..86d1db7664 100644
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -271,7 +271,7 @@ contents_received_callback (GtkClipboard *clipboard,
 
 }
 
-void
+static void
 on_edit_paste (PsppireSyntaxWindow *sw)
 {
   GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (sw));
@@ -284,6 +284,26 @@ on_edit_paste (PsppireSyntaxWindow *sw)
 				  sw);
 }
 
+static void
+on_owner_change (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
+{
+  gint i;
+  gboolean compatible_target = FALSE;
+  PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (data);
+
+  for (i = 0 ; i < sizeof (targets) / sizeof (targets[0]) ; ++i)
+    {
+      GdkAtom atom = gdk_atom_intern (targets[i].target, TRUE);
+      if ( gtk_clipboard_wait_is_target_available (clip, atom))
+	{
+	  compatible_target = TRUE;
+	  break;
+	}
+    }
+
+  gtk_action_set_sensitive (sw->edit_paste, compatible_target);
+}
+
 
 
 
@@ -416,7 +436,7 @@ save_editor_to_file (PsppireSyntaxWindow *se,
   if ( result )
     {
       char *fn = g_filename_display_name (filename);
-      gchar *msg = g_strdup_printf (_("Saved file \"%s\""), fn);
+      gchar *msg = g_strdup_printf (_("Saved file `%s'"), fn);
       g_free (fn);
       gtk_statusbar_push (GTK_STATUSBAR (se->sb), se->text_context, msg);
       gtk_text_buffer_set_modified (buffer, FALSE);
@@ -552,11 +572,8 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
 
   GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view");
 
-
-  GtkClipboard *clipboard =
-    gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY);
-
-  g_signal_connect_swapped (clipboard, "owner-change", G_CALLBACK (selection_changed), window);
+  GtkClipboard *clip_selection = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
+  GtkClipboard *clip_primary =   gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY);
 
   window->cliptext = NULL;
 
@@ -565,19 +582,24 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window)
   window->edit_cut = get_action_assert (xml, "edit_cut");
   window->edit_paste = get_action_assert (xml, "edit_paste");
 
-gtk_action_set_sensitive (window->edit_paste, TRUE);
-
   window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
   window->lexer = lex_create (the_source_stream);
 
   window->sb = get_widget_assert (xml, "statusbar2");
   window->text_context = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->sb), "Text Context");
 
-  g_signal_connect (window->buffer, "changed", G_CALLBACK (on_text_changed), window);
+  g_signal_connect (window->buffer, "changed", 
+		    G_CALLBACK (on_text_changed), window);
 
-  g_signal_connect (window->buffer, "modified-changed",
+  g_signal_connect (window->buffer, "modified-changed", 
 		    G_CALLBACK (on_modified_changed), window);
 
+  g_signal_connect_swapped (clip_primary, "owner-change", 
+			    G_CALLBACK (selection_changed), window);
+
+  g_signal_connect (clip_selection, "owner-change", 
+		    G_CALLBACK (on_owner_change), window);
+
   connect_help (xml);
 
   gtk_container_add (GTK_CONTAINER (window), box);
@@ -588,7 +610,6 @@ gtk_action_set_sensitive (window->edit_paste, TRUE);
 
   g_object_ref (window->sb);
 
-
   gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), window->sb, FALSE, TRUE, 0);
@@ -684,7 +705,8 @@ GtkWidget*
 psppire_syntax_window_new (void)
 {
   return GTK_WIDGET (g_object_new (psppire_syntax_window_get_type (),
-				   "filename", "Syntax",
+				   /* TRANSLATORS: This will form a filename.  Please avoid whitespace. */
+				   "filename", _("Syntax"),
 				   "description", _("Syntax Editor"),
 				   NULL));
 }
@@ -699,7 +721,7 @@ error_dialog (GtkWindow *w, const gchar *filename,  GError *err)
 			    GTK_DIALOG_DESTROY_WITH_PARENT,
 			    GTK_MESSAGE_ERROR,
 			    GTK_BUTTONS_CLOSE,
-			    _("Cannot load syntax file '%s'"),
+			    _("Cannot load syntax file `%s'"),
 			    fn);
 
   g_free (fn);