[Xfce4-commits] <midori:master> Make all Copy items in the context menu also use primary clipboard

[Christian Dywan]

Updating branch refs/heads/master
         to 0cdcefd4e83a42c333d6448e9b503262583a59c1 (commit)
       from f3cf2561ff90e52746eecd73a9ab6c6286535a39 (commit)

commit 0cdcefd4e83a42c333d6448e9b503262583a59c1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Oct 21 19:43:39 2009 +0200

    Make all Copy items in the context menu also use primary clipboard

 midori/midori-view.c |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 0890abf..b436134 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1293,6 +1293,19 @@ gtk_widget_scroll_event_cb (WebKitWebView*  web_view,
         return FALSE;
 }
 
+static void
+midori_web_view_set_clipboard (GtkWidget*   widget,
+                                      const gchar* text)
+{
+    GdkDisplay* display = gtk_widget_get_display (widget);
+    GtkClipboard* clipboard;
+
+    clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+    gtk_clipboard_set_text (clipboard, text, -1);
+    clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY);
+    gtk_clipboard_set_text (clipboard, text, -1);
+}
+
 #if WEBKIT_CHECK_VERSION (1, 1, 15)
 static void
 midori_web_view_menu_open_activate_cb (GtkWidget*  widget,
@@ -1312,10 +1325,7 @@ static void
 midori_web_view_menu_link_copy_activate_cb (GtkWidget*  widget,
                                             MidoriView* view)
 {
-    GdkDisplay* display = gtk_widget_get_display (widget);
-    GtkClipboard* clipboard = gtk_clipboard_get_for_display (display,
-        GDK_SELECTION_CLIPBOARD);
-    gtk_clipboard_set_text (clipboard, view->link_uri, -1);
+    midori_web_view_set_clipboard (widget, view->link_uri);
 }
 
 static void
@@ -1356,11 +1366,8 @@ static void
 midori_web_view_menu_image_copy_activate_cb (GtkWidget*  widget,
                                              MidoriView* view)
 {
-    GdkDisplay* display = gtk_widget_get_display (widget);
-    GtkClipboard* clipboard = gtk_clipboard_get_for_display (display,
-        GDK_SELECTION_CLIPBOARD);
     gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
-    gtk_clipboard_set_text (clipboard, uri, -1);
+    midori_web_view_set_clipboard (widget, uri);
     g_free (uri);
 }
 
@@ -1385,11 +1392,8 @@ static void
 midori_web_view_menu_video_copy_activate_cb (GtkWidget*  widget,
                                              MidoriView* view)
 {
-    GdkDisplay* display = gtk_widget_get_display (widget);
-    GtkClipboard* clipboard = gtk_clipboard_get_for_display (display,
-        GDK_SELECTION_CLIPBOARD);
     gchar* uri = katze_object_get_string (view->hit_test, "media-uri");
-    gtk_clipboard_set_text (clipboard, uri, -1);
+    midori_web_view_set_clipboard (widget, uri);
     g_free (uri);
 }
 
@@ -1473,10 +1477,7 @@ static void
 midori_web_view_menu_copy_activate_cb (GtkWidget*  widget,
                                        MidoriView* view)
 {
-    GdkDisplay* display = gtk_widget_get_display (widget);
-    GtkClipboard* clipboard = gtk_clipboard_get_for_display (display,
-        GDK_SELECTION_CLIPBOARD);
-    gtk_clipboard_set_text (clipboard, view->selected_text, -1);
+    midori_web_view_set_clipboard (widget, view->selected_text);
 }
 #endif