[Xfce4-commits] <midori:master> Double-check that view->selected_text is set

[Christian Dywan]

Updating branch refs/heads/master
         to 90eaea3dca756782d9f800ecfefe8b327171b372 (commit)
       from 532335702a65aa354abd6c64255757af051aa0e0 (commit)

commit 90eaea3dca756782d9f800ecfefe8b327171b372
Author: André Stösel <andre at stoesel.de>
Date:   Tue Mar 20 18:25:56 2012 +0100

    Double-check that view->selected_text is set
    
    Sometimes view->selected_text isn't set even if
    context has WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION

 midori/midori-view.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 2e14978..752261b 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2357,7 +2357,8 @@ midori_view_populate_popup (MidoriView* view,
     context = katze_object_get_int (view->hit_test, "context");
     has_selection = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION;
     /* Ensure view->selected_text */
-    midori_view_has_selection (view);
+    if (!midori_view_has_selection (view))
+        has_selection = false;
     is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
     is_image = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE;
     is_media = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA;