From ccc250e10e478364e610dc9d274dec1466cc24a4 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Fri, 12 Jul 2013 12:20:32 +0200 Subject: ev-window: Use g_signal_emit_by name instead of ev_view_scroll origin commit: https://git.gnome.org/browse/evince/commit/?h=gnome-3-10&id=3e32b5d --- shell/ev-window.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/shell/ev-window.c b/shell/ev-window.c index 3d3a4d97..0555d95f 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -3921,7 +3921,7 @@ ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window) if (window->priv->document && window->priv->document->iswebdocument == TRUE) return; - ev_view_scroll (EV_VIEW (window->priv->view), GTK_SCROLL_PAGE_FORWARD, FALSE); + g_signal_emit_by_name (window->priv->view, "scroll", GTK_SCROLL_PAGE_FORWARD, GTK_ORIENTATION_VERTICAL); } static void @@ -3931,7 +3931,7 @@ ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window) if (window->priv->document && window->priv->document->iswebdocument == TRUE) return; - ev_view_scroll (EV_VIEW (window->priv->view), GTK_SCROLL_PAGE_BACKWARD, FALSE); + g_signal_emit_by_name (window->priv->view, "scroll", GTK_SCROLL_PAGE_BACKWARD, GTK_ORIENTATION_VERTICAL); } static void @@ -5697,15 +5697,6 @@ find_bar_visibility_changed_cb (EggFindBar *find_bar, } } -static void -find_bar_scroll (EggFindBar *find_bar, - GtkScrollType scroll, - EvWindow *ev_window) -{ - if (ev_window->priv->document->iswebdocument == TRUE ) return ; - ev_view_scroll (EV_VIEW (ev_window->priv->view), scroll, FALSE); -} - static void zoom_control_changed_cb (EphyZoomAction *action, float zoom, @@ -7988,10 +7979,6 @@ ev_window_init (EvWindow *ev_window) "notify::visible", G_CALLBACK (find_bar_visibility_changed_cb), ev_window); - g_signal_connect (ev_window->priv->find_bar, - "scroll", - G_CALLBACK (find_bar_scroll), - ev_window); /* Popups */ ev_window->priv->view_popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, -- cgit v1.2.1