summaryrefslogtreecommitdiff
path: root/src/eom-window.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-07-27 15:57:15 +0200
committerinfirit <[email protected]>2014-07-27 21:16:30 +0200
commit7a1720ee8a365ae6418de438d4c42068bf9a97d5 (patch)
tree3bb15008cb9c6e3774734738225f4ddaf63de8e2 /src/eom-window.c
parentf9308d5f86250219e6bf35208e517780d2de2772 (diff)
downloadeom-7a1720ee8a365ae6418de438d4c42068bf9a97d5.tar.bz2
eom-7a1720ee8a365ae6418de438d4c42068bf9a97d5.tar.xz
Switch scrollwheel zoom setting with GSettings
Based on eog commit 8c7cf9f8938673eda2843be650b558084b44303e From Felix Riemann <[email protected]>
Diffstat (limited to 'src/eom-window.c')
-rw-r--r--src/eom-window.c30
1 files changed, 2 insertions, 28 deletions
diff --git a/src/eom-window.c b/src/eom-window.c
index 287a037..6fc4eb6 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -266,26 +266,6 @@ eom_window_interp_out_type_changed_cb (GSettings *settings, gchar *key, gpointer
}
static void
-eom_window_scroll_wheel_zoom_changed_cb (GSettings *settings, gchar *key, gpointer user_data)
-{
- EomWindowPrivate *priv;
- gboolean scroll_wheel_zoom = FALSE;
-
- eom_debug (DEBUG_PREFERENCES);
-
- g_return_if_fail (EOM_IS_WINDOW (user_data));
-
- priv = EOM_WINDOW (user_data)->priv;
-
- g_return_if_fail (EOM_IS_SCROLL_VIEW (priv->view));
-
- scroll_wheel_zoom = g_settings_get_boolean (settings, key);
-
- eom_scroll_view_set_scroll_wheel_zoom (EOM_SCROLL_VIEW (priv->view),
- scroll_wheel_zoom);
-}
-
-static void
eom_window_transparency_changed_cb (GSettings *settings, gchar *key, gpointer user_data)
{
EomWindowPrivate *priv;
@@ -4528,6 +4508,8 @@ eom_window_construct_ui (EomWindow *window)
G_CALLBACK (view_zoom_changed_cb),
window);
+ g_settings_bind (priv->view_settings, EOM_CONF_VIEW_SCROLL_WHEEL_ZOOM,
+ priv->view, "scrollwheel-zoom", G_SETTINGS_BIND_GET);
g_settings_bind (priv->view_settings, EOM_CONF_VIEW_ZOOM_MULTIPLIER,
priv->view, "zoom-multiplier", G_SETTINGS_BIND_GET);
@@ -4577,9 +4559,6 @@ eom_window_construct_ui (EomWindow *window)
eom_window_interp_out_type_changed_cb (priv->view_settings,
EOM_CONF_VIEW_INTERPOLATE,
window);
- eom_window_scroll_wheel_zoom_changed_cb (priv->view_settings,
- EOM_CONF_VIEW_SCROLL_WHEEL_ZOOM,
- window);
eom_window_bg_color_changed_cb (priv->view_settings,
EOM_CONF_VIEW_BACKGROUND_COLOR,
window);
@@ -4642,11 +4621,6 @@ eom_window_init (EomWindow *window)
window);
g_signal_connect (priv->view_settings,
- "changed::" EOM_CONF_VIEW_SCROLL_WHEEL_ZOOM,
- G_CALLBACK (eom_window_scroll_wheel_zoom_changed_cb),
- window);
-
- g_signal_connect (priv->view_settings,
"changed::" EOM_CONF_VIEW_BACKGROUND_COLOR,
G_CALLBACK (eom_window_bg_color_changed_cb),
window);