From 708181e0ec7ef17e7e19cd11e539aa2f5188cd29 Mon Sep 17 00:00:00 2001
From: Craig Marshall <craig9@gmail.com>
Date: Tue, 26 Mar 2013 19:35:00 +1100
Subject: Fixed broken logic in zoom history to fix bug 1106031 (and removed
 some unrelated and unnecessary debug output)

(bzr r12245)
---
 src/desktop.cpp      | 2 +-
 src/tools-switch.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index c04dba6cc..0bf442b7a 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -811,7 +811,7 @@ SPDesktop::push_current_zoom (std::list<Geom::Rect> &history)
 {
     Geom::Rect area = get_display_area();
 
-    if (history.empty() || history.front() == area) {
+    if (history.empty() || history.front() != area) {
         history.push_front(area);
     }
 }
diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index f0535e2ff..9e7dfa3f9 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -213,7 +213,6 @@ tools_switch(SPDesktop *dt, int num)
             dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Drag</b> or <b>double click</b> to create a mesh on selected objects, <b>drag handles</b> to adjust meshes."));
             break;
         case TOOLS_ZOOM:
-            std::cout << "tools-switch.cpp: TOOLS_ZOOM" << std::endl;
             dt->set_event_context(SP_TYPE_ZOOM_CONTEXT, tool_names[num]);
             dt->activate_guides(false);
             inkscape_eventcontext_set(sp_desktop_event_context(dt));
-- 
cgit v1.2.3