Fix critical warnings when there is no document loaded.

[evince.git] / shell / ev-view.c

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 676d08d0f5698a221582120d355c9f8f0d212cea..27a2149a2b63b16a65cb2b5f42abb622aa7ce29d 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -1982,6 +1982,9 @@ ev_view_button_press_event (GtkWidget      *widget,
                            GdkEventButton *event)
 {
        EvView *view = EV_VIEW (widget);
                            GdkEventButton *event)
 {
        EvView *view = EV_VIEW (widget);

+
+       if (!view->document)
+               return FALSE;

        
        if (!GTK_WIDGET_HAS_FOCUS (widget)) {
                gtk_widget_grab_focus (widget);
        
        if (!GTK_WIDGET_HAS_FOCUS (widget)) {
                gtk_widget_grab_focus (widget);


@@ -2004,7 +2007,8 @@ ev_view_button_press_event (GtkWidget      *widget,
                                }
                                
                                gtk_widget_queue_draw (widget);
                                }
                                
                                gtk_widget_queue_draw (widget);

-                       } else if ((image = ev_view_get_image_at_location (view, event->x, event->y))) {
+                       } else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) &&
+                                  (image = ev_view_get_image_at_location (view, event->x, event->y))) {

                                if (view->image_dnd_info.image)
                                        g_object_unref (view->image_dnd_info.image);
                                view->image_dnd_info.image = g_object_ref (image);
                                if (view->image_dnd_info.image)
                                        g_object_unref (view->image_dnd_info.image);
                                view->image_dnd_info.image = g_object_ref (image);


@@ -2583,6 +2587,9 @@ ev_view_key_press_event (GtkWidget   *widget,
        EvView *view = EV_VIEW (widget);
        EvPresentationState current;
 
        EvView *view = EV_VIEW (widget);
        EvPresentationState current;
 

+       if (!view->document)
+               return FALSE;
+       

        if (!view->presentation ||
            view->presentation_state == EV_PRESENTATION_END)
                return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
        if (!view->presentation ||
            view->presentation_state == EV_PRESENTATION_END)
                return gtk_bindings_activate_event (GTK_OBJECT (widget), event);