debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christian Dywan 2009-10-21 19:43:39 +02:00
parent f3cf2561ff
commit 0cdcefd4e8
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
midori/midori-view.c
View file

@ -1293,6 +1293,19 @@ gtk_widget_scroll_event_cb (WebKitWebView* web_view,
return FALSE; 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) #if WEBKIT_CHECK_VERSION (1, 1, 15)
static void static void
midori_web_view_menu_open_activate_cb (GtkWidget* widget, 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, midori_web_view_menu_link_copy_activate_cb (GtkWidget* widget,
MidoriView* view) MidoriView* view)
{ {
GdkDisplay* display = gtk_widget_get_display (widget); midori_web_view_set_clipboard (widget, view->link_uri);
GtkClipboard* clipboard = gtk_clipboard_get_for_display (display,
GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, view->link_uri, -1);
} }
static void static void
@ -1356,11 +1366,8 @@ static void
midori_web_view_menu_image_copy_activate_cb (GtkWidget* widget, midori_web_view_menu_image_copy_activate_cb (GtkWidget* widget,
MidoriView* view) 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"); 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); g_free (uri);
} }
@ -1385,11 +1392,8 @@ static void
midori_web_view_menu_video_copy_activate_cb (GtkWidget* widget, midori_web_view_menu_video_copy_activate_cb (GtkWidget* widget,
MidoriView* view) 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"); 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); g_free (uri);
} }
@ -1473,10 +1477,7 @@ static void
midori_web_view_menu_copy_activate_cb (GtkWidget* widget, midori_web_view_menu_copy_activate_cb (GtkWidget* widget,
MidoriView* view) MidoriView* view)
{ {
GdkDisplay* display = gtk_widget_get_display (widget); midori_web_view_set_clipboard (widget, view->selected_text);
GtkClipboard* clipboard = gtk_clipboard_get_for_display (display,
GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, view->selected_text, -1);
} }
#endif #endif