X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view.c;h=8ccee695674800751b3651d1dec61ee66b3c2700;hb=41d617b23b7dd9e3162779396b3557bcde17d53b;hp=47fb438c94f2c97b90e09f71a3feafffb31b58df;hpb=b4b109f954781cdcdcfb90202868d2f7efb43e40;p=evince.git

diff --git a/libview/ev-view.c b/libview/ev-view.c
index 47fb438c..8ccee695 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -2398,7 +2398,7 @@ ev_view_window_child_move_with_parent (EvView    *view,
 		ev_view_window_child_move (view, child, dest_x, dest_y);
 	}
 
-	if (child->visible && !GTK_WIDGET_VISIBLE (window))
+	if (child->visible && !gtk_widget_get_visible (window))
 		gtk_widget_show (window);
 }
 
@@ -3096,29 +3096,26 @@ ev_view_do_popup_menu (EvView *view,
 		       gdouble x,
 		       gdouble y)
 {
+	GList        *items = NULL;
 	EvLink       *link;
 	EvImage      *image;
 	EvAnnotation *annot;
 
 	image = ev_view_get_image_at_location (view, x, y);
-	if (image) {
-		g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, image);
-		return TRUE;
-	}
+	if (image)
+		items = g_list_prepend (items, image);
 
 	link = ev_view_get_link_at_location (view, x, y);
-	if (link) {
-		g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link);
-		return TRUE;
-	}
+	if (link)
+		items = g_list_prepend (items, link);
 
 	annot = ev_view_get_annotation_at_location (view, x, y);
-	if (annot) {
-		g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, annot);
-		return TRUE;
-	}
+	if (annot)
+		items = g_list_prepend (items, annot);
+
+	g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, items);
 
-	g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, NULL);
+	g_list_free (items);
 
 	return TRUE;
 }
@@ -3253,7 +3250,7 @@ ev_view_button_press_event (GtkWidget      *widget,
 	if (!view->document)
 		return FALSE;
 	
-	if (!GTK_WIDGET_HAS_FOCUS (widget)) {
+	if (!gtk_widget_has_focus (widget)) {
 		gtk_widget_grab_focus (widget);
 	}
 
@@ -3765,7 +3762,7 @@ ev_view_key_press_event (GtkWidget   *widget,
 	if (!view->document)
 		return FALSE;
 
-	if (!GTK_WIDGET_HAS_FOCUS (widget)) {
+	if (!gtk_widget_has_focus (widget)) {
 		/* Forward key events to current focused window child */
 		if (view->window_child_focus) {
 			GdkEventKey *new_event;
@@ -3923,7 +3920,7 @@ draw_loading_text (EvView       *view,
 	gint     width, height;
 
 	if (!view->loading_text) {
-		const gchar *loading_text = _("Loading...");
+		const gchar *loading_text = _("Loading…");
 		PangoLayout *layout;
 		PangoFontDescription *font_desc;
 		PangoRectangle logical_rect;
@@ -4265,9 +4262,9 @@ ev_view_class_init (EvViewClass *class)
 		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		         G_STRUCT_OFFSET (EvViewClass, popup_menu),
 		         NULL, NULL,
-		         g_cclosure_marshal_VOID__OBJECT,
+		         g_cclosure_marshal_VOID__POINTER,
 		         G_TYPE_NONE, 1,
-			 G_TYPE_OBJECT);
+			 G_TYPE_POINTER);
 	signals[SIGNAL_SELECTION_CHANGED] = g_signal_new ("selection-changed",
                          G_TYPE_FROM_CLASS (object_class),
                          G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
@@ -4384,7 +4381,7 @@ on_adjustment_value_changed (GtkAdjustment *adjustment,
 	gint x, y;
 	GList *children, *l;
 
-	if (! GTK_WIDGET_REALIZED (view))
+	if (!gtk_widget_get_realized (GTK_WIDGET (view)))
 		return;
 
 	if (view->hadjustment) {
@@ -5367,7 +5364,7 @@ merge_selection_region (EvView *view,
 							       view->scale,
 							       &tmp_region);
 
-			if (tmp_region) {
+			if (tmp_region && !gdk_region_empty (tmp_region)) {
 				new_sel->covered_region = gdk_region_copy (tmp_region);
 			}
 		}