[Xfce4-commits] <midori:master> Allow image zoom if text and images can be zoomed

[Christian Dywan]

Updating branch refs/heads/master
         to 7e00e760ba2f2a7dc829f5336ea1a898bd6f1cd1 (commit)
       from c712758ed3967b020e8b5a3653e898cd9665e03a (commit)

commit 7e00e760ba2f2a7dc829f5336ea1a898bd6f1cd1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Jan 5 19:21:50 2011 +0100

    Allow image zoom if text and images can be zoomed

 midori/midori-view.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 2efc0a8..34502a0 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4703,7 +4703,9 @@ midori_view_can_zoom_in (MidoriView* view)
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
 
-    return view->web_view != NULL && !g_str_has_prefix (view->mime_type, "image/");
+    return view->web_view != NULL
+        && (katze_object_get_boolean (view->settings, "zoom-text-and-images")
+        || !g_str_has_prefix (view->mime_type, "image/"));
 }
 
 gboolean
@@ -4711,7 +4713,9 @@ midori_view_can_zoom_out (MidoriView* view)
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
 
-    return view->web_view != NULL && !g_str_has_prefix (view->mime_type, "image/");
+    return view->web_view != NULL
+        && (katze_object_get_boolean (view->settings, "zoom-text-and-images")
+        || !g_str_has_prefix (view->mime_type, "image/"));
 }
 
 gboolean