Make smclient optional

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

diff --git a/libview/ev-view.c b/libview/ev-view.c
index b7ca94331ee3c3a58e76d76fc6d4c16f7b987f05..f69b7b0a634b27a2b147b026ac5cad13c48a4b98 100644 (file)
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -2314,6 +2314,9 @@ show_annotation_windows (EvView *view,
                if (!EV_IS_ANNOTATION_MARKUP (annot))
                        continue;
 
                if (!EV_IS_ANNOTATION_MARKUP (annot))
                        continue;
 

+               if (!ev_annotation_markup_has_popup (EV_ANNOTATION_MARKUP (annot)))
+                       continue;
+

                window = g_object_get_data (G_OBJECT (annot), "popup");
                if (window) {
                        ev_view_window_child_move_with_parent (view, window);
                window = g_object_get_data (G_OBJECT (annot), "popup");
                if (window) {
                        ev_view_window_child_move_with_parent (view, window);


@@ -4625,10 +4628,14 @@ ev_view_presentation_animation_start (EvView *view,
        if (!effect)
                return;
 
        if (!effect)
                return;
 

-       surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page);

        view->animation = ev_transition_animation_new (effect);
        view->animation = ev_transition_animation_new (effect);

+
+       surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page);

        ev_transition_animation_set_origin_surface (view->animation, surface);
        ev_transition_animation_set_origin_surface (view->animation, surface);

-               
+       surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, new_page);
+       if (surface)
+               ev_transition_animation_set_dest_surface (view->animation, surface);
+

        g_signal_connect (view->animation, "frame",
                          G_CALLBACK (ev_view_transition_animation_frame), view);
        g_signal_connect (view->animation, "finished",
        g_signal_connect (view->animation, "frame",
                          G_CALLBACK (ev_view_transition_animation_frame), view);
        g_signal_connect (view->animation, "finished",