X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-view.c;h=6f87b6a63cb176e2c3c1d8d29de9c8dba77769fa;hb=53495c18d3367b6ddc4cb9bcb398278d711eea6a;hp=7f77726447603d574f5a6504755b4b40a8661e7f;hpb=9ab501f7ddc9df9a2904f88602146261d6f7dcae;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 7f777264..6f87b6a6 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -56,6 +56,7 @@ enum {
 	PROP_SIZING_MODE,
 	PROP_ZOOM,
 	PROP_ROTATION,
+	PROP_HAS_SELECTION,
 };
 
 enum {
@@ -1117,7 +1118,8 @@ location_in_selected_text (EvView  *view,
 		if (page != selection->page)
 			continue;
 		
-		if (gdk_region_point_in (selection->covered_region, x_offset, y_offset))
+		if (selection->covered_region &&
+		    gdk_region_point_in (selection->covered_region, x_offset, y_offset))
 			return TRUE;
 	}
 
@@ -1363,9 +1365,13 @@ handle_link_over_xy (EvView *view, gint x, gint y)
         if (link) {
 		char *msg = tip_from_link (view, link);
 
-		ev_tooltip_set_position (EV_TOOLTIP (view->link_tooltip), x, y);
-		ev_tooltip_set_text (EV_TOOLTIP (view->link_tooltip), msg);
-		ev_tooltip_activate (EV_TOOLTIP (view->link_tooltip));
+		if (msg && g_utf8_validate (msg, -1, NULL)) {
+			EvTooltip *tooltip = EV_TOOLTIP (view->link_tooltip);
+
+			ev_tooltip_set_position (tooltip, x, y);
+			ev_tooltip_set_text (tooltip, msg);
+			ev_tooltip_activate (tooltip);
+		}
 		g_free (msg);
 
 		ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
@@ -2328,6 +2334,10 @@ ev_view_get_property (GObject *object,
 	case PROP_ROTATION:
 		g_value_set_int (value, view->rotation);
 		break;
+	case PROP_HAS_SELECTION:
+		g_value_set_boolean (value,
+				     view->selection_info.selections != NULL);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 	}
@@ -2474,6 +2484,13 @@ ev_view_class_init (EvViewClass *class)
 							       360,
 							       0,
 							       G_PARAM_READWRITE));
+	g_object_class_install_property (object_class,
+					 PROP_HAS_SELECTION,
+					 g_param_spec_boolean ("has-selection",
+							       "Has selection",
+							       "The view has selections",
+							       FALSE,
+							       G_PARAM_READABLE));
 
 	binding_set = gtk_binding_set_by_class (class);
 
@@ -2494,6 +2511,7 @@ ev_view_init (EvView *view)
 	view->pressed_button = -1;
 	view->cursor = EV_VIEW_CURSOR_NORMAL;
 	view->drag_info.in_drag = FALSE;
+	view->selection_info.selections = NULL;
 	view->selection_info.in_selection = FALSE;
 	view->selection_info.in_drag = FALSE;
 	view->selection_mode = EV_VIEW_SELECTION_TEXT;
@@ -3527,6 +3545,7 @@ merge_selection_region (EvView *view,
 	g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL);
 	view->selection_info.selections = new_list;
 	ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, new_list);
+	g_object_notify (G_OBJECT (view), "has-selection");
 
 	new_list_ptr = new_list;
 	old_list_ptr = old_list;
@@ -3657,6 +3676,7 @@ clear_selection (EvView *view)
 	g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL);
 	view->selection_info.selections = NULL;
 	view->selection_info.in_selection = FALSE;
+	g_object_notify (G_OBJECT (view), "has-selection");
 }
 
 
@@ -3691,9 +3711,16 @@ ev_view_select_all (EvView *view)
 	}
 
 	ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, view->selection_info.selections);
+	g_object_notify (G_OBJECT (view), "has-selection");
 	gtk_widget_queue_draw (GTK_WIDGET (view));
 }
 
+gboolean
+ev_view_get_has_selection (EvView *view)
+{
+	return view->selection_info.selections != NULL;
+}
+
 static char *
 get_selected_text (EvView *ev_view)
 {