| 1 |
ssuominen 11/10/02 21:31:10 |
| 2 |
|
| 3 |
Added: midori-0.4.0-webkit151.patch |
| 4 |
Log: |
| 5 |
Fix building with webkit-gtk >= 1.5.1 wrt #385371 by Hanno Meyer-Thurow |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/midori/files/midori-0.4.0-webkit151.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/files/midori-0.4.0-webkit151.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/files/midori-0.4.0-webkit151.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: midori-0.4.0-webkit151.patch |
| 16 |
=================================================================== |
| 17 |
From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Christian Dywan <christian@×××××××××.de> |
| 19 |
Date: Wed, 21 Sep 2011 21:50:51 +0000 |
| 20 |
Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1 |
| 21 |
|
| 22 |
Fixes: https://bugs.launchpad.net/midori/+bug/799603 |
| 23 |
--- |
| 24 |
diff --git a/midori/midori-view.c b/midori/midori-view.c |
| 25 |
index 0d7a96e..e426e7f 100644 |
| 26 |
--- a/midori/midori-view.c |
| 27 |
+++ b/midori/midori-view.c |
| 28 |
@@ -39,9 +39,11 @@ |
| 29 |
#include <sys/utsname.h> |
| 30 |
#endif |
| 31 |
|
| 32 |
+#if !WEBKIT_CHECK_VERSION (1, 5, 1) |
| 33 |
/* This is unstable API, so we need to declare it */ |
| 34 |
gchar* |
| 35 |
webkit_web_view_get_selected_text (WebKitWebView* web_view); |
| 36 |
+#endif |
| 37 |
|
| 38 |
static void |
| 39 |
midori_view_construct_web_view (MidoriView* view); |
| 40 |
@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view) |
| 41 |
gboolean |
| 42 |
midori_view_has_selection (MidoriView* view) |
| 43 |
{ |
| 44 |
+#if WEBKIT_CHECK_VERSION (1, 5, 1) |
| 45 |
+ WebKitDOMDocument* doc; |
| 46 |
+ WebKitDOMDOMWindow* window; |
| 47 |
+ WebKitDOMDOMSelection* selection; |
| 48 |
+ WebKitDOMRange* range; |
| 49 |
+#endif |
| 50 |
+ |
| 51 |
g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); |
| 52 |
|
| 53 |
+ |
| 54 |
+#if WEBKIT_CHECK_VERSION (1, 5, 1) |
| 55 |
+ doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view)); |
| 56 |
+ window = webkit_dom_document_get_default_view (doc); |
| 57 |
+ selection = webkit_dom_dom_window_get_selection (window); |
| 58 |
+ if (selection == NULL) |
| 59 |
+ return FALSE; |
| 60 |
+ |
| 61 |
+ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); |
| 62 |
+ if (range == NULL) |
| 63 |
+ return FALSE; |
| 64 |
+ |
| 65 |
+ katze_assign (view->selected_text, webkit_dom_range_get_text (range)); |
| 66 |
+#else |
| 67 |
katze_assign (view->selected_text, webkit_web_view_get_selected_text ( |
| 68 |
WEBKIT_WEB_VIEW (view->web_view))); |
| 69 |
+#endif |
| 70 |
+ |
| 71 |
if (view->selected_text && *view->selected_text) |
| 72 |
return TRUE; |
| 73 |
else |
| 74 |
-- |
| 75 |
cgit |
Archives