From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 5 Jan 2011 18:21:50 +0000 (+0100)
Subject: Allow image zoom if text and images can be zoomed
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e00e760ba2f2a7dc829f5336ea1a898bd6f1cd1;p=midori

Allow image zoom if text and images can be zoomed
---

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 2efc0a80..34502a07 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