From 193b25a53c51a36fe9538e03203b0054c8cfc355 Mon Sep 17 00:00:00 2001
From: mc <>
Date: Wed, 18 Feb 2015 02:02:37 +0100
Subject: Just... some... more... lines...

(bzr r13922.1.2)
---
 src/desktop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/desktop.cpp')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index cdf8f276c..64353e582 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -716,7 +716,7 @@ Inkscape::UI::Widget::Dock* SPDesktop::getDock() {
 /**
  * \see SPDocument::getItemFromListAtPointBottom()
  */
-SPItem *SPDesktop::getItemFromListAtPointBottom(const GSList *list, Geom::Point const &p) const
+SPItem *SPDesktop::getItemFromListAtPointBottom(const SelContainer &list, Geom::Point const &p) const
 {
     g_return_val_if_fail (doc() != NULL, NULL);
     return SPDocument::getItemFromListAtPointBottom(dkey, doc()->getRoot(), list, p);
-- 
cgit v1.2.3


From 5fd00cab14d48beaf2279a2b8f3ad5b02b76c87b Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <mc>
Date: Thu, 19 Feb 2015 04:25:21 +0100
Subject: Put a few std::vector<SPitem*>

(bzr r13922.1.5)
---
 src/desktop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/desktop.cpp')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index 64353e582..0cf0a3872 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -716,7 +716,7 @@ Inkscape::UI::Widget::Dock* SPDesktop::getDock() {
 /**
  * \see SPDocument::getItemFromListAtPointBottom()
  */
-SPItem *SPDesktop::getItemFromListAtPointBottom(const SelContainer &list, Geom::Point const &p) const
+SPItem *SPDesktop::getItemFromListAtPointBottom(const std::vector<SPItem*> &list, Geom::Point const &p) const
 {
     g_return_val_if_fail (doc() != NULL, NULL);
     return SPDocument::getItemFromListAtPointBottom(dkey, doc()->getRoot(), list, p);
-- 
cgit v1.2.3


From 48e0423afcb02fe4a0f705d828a0dbdb3106b397 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Fri, 8 May 2015 15:46:25 +0200
Subject: fixes a few of jenkins warnings

(bzr r14126)
---
 src/desktop.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/desktop.cpp')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index 5a1558b0f..02df50c6b 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -947,7 +947,6 @@ void SPDesktop::zoom_quick(bool enable)
 
         if (!zoomed) {
             zoom_relative(_quick_zoom_stored_area.midpoint()[Geom::X], _quick_zoom_stored_area.midpoint()[Geom::Y], 2.0);
-            zoomed = true;
         }
     } else {
         set_display_area(_quick_zoom_stored_area, false);
-- 
cgit v1.2.3