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/ui/dialog/icon-preview.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/ui/dialog/icon-preview.cpp')

diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index b908a90cb..79e5b556d 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -366,16 +366,14 @@ void IconPreviewPanel::refreshPreview()
                 if ( sel ) {
                     //g_message("found a selection to play with");
 
-                    GSList const *items = sel->itemList();
-                    while ( items && !target ) {
-                        SPItem* item = SP_ITEM( items->data );
+                    SelContainer const items = sel->itemList();
+                    for(SelContainer::const_iterator i=items.begin();!target && i!=items.end();i++){
+                        SPItem* item = SP_ITEM( *i);
                         gchar const *id = item->getId();
                         if ( id ) {
                             targetId = id;
                             target = item;
                         }
-
-                        items = g_slist_next(items);
                     }
                 }
             }
-- 
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/ui/dialog/icon-preview.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/dialog/icon-preview.cpp')

diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 79e5b556d..6ad3d61ac 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -366,8 +366,8 @@ void IconPreviewPanel::refreshPreview()
                 if ( sel ) {
                     //g_message("found a selection to play with");
 
-                    SelContainer const items = sel->itemList();
-                    for(SelContainer::const_iterator i=items.begin();!target && i!=items.end();i++){
+                	std::vector<SPItem*> const items = sel->itemList();
+                    for(std::vector<SPItem*>::const_iterator i=items.begin();!target && i!=items.end();i++){
                         SPItem* item = SP_ITEM( *i);
                         gchar const *id = item->getId();
                         if ( id ) {
-- 
cgit v1.2.3


From 9a7fa4d1899d30ec745107823f307b2a0bf3172f Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <mc@localhost.localdomain>
Date: Fri, 27 Feb 2015 03:10:36 +0100
Subject: corrected the casts (hopefully)

(bzr r13922.1.10)
---
 src/ui/dialog/icon-preview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/dialog/icon-preview.cpp')

diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 6ad3d61ac..e9ee7802d 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -368,7 +368,7 @@ void IconPreviewPanel::refreshPreview()
 
                 	std::vector<SPItem*> const items = sel->itemList();
                     for(std::vector<SPItem*>::const_iterator i=items.begin();!target && i!=items.end();i++){
-                        SPItem* item = SP_ITEM( *i);
+                        SPItem* item = *i;
                         gchar const *id = item->getId();
                         if ( id ) {
                             targetId = id;
-- 
cgit v1.2.3


From ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 28 Apr 2015 00:38:31 +0100
Subject: Fix unnecessary inclusion of glibmm/threads.h.  This can be resolved
 by ensuring that glibmm headers always preceed glib.h headers. Same applies
 with gtkmm/gtk+ etc

(bzr r14064)
---
 src/ui/dialog/icon-preview.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/ui/dialog/icon-preview.cpp')

diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index b908a90cb..069b61cb7 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -17,10 +17,6 @@
 # include <config.h>
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/buttonbox.h>
 #include <boost/scoped_ptr.hpp>
 
-- 
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/ui/dialog/icon-preview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/dialog/icon-preview.cpp')

diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 7dc55c95c..77f120e1a 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -312,7 +312,7 @@ void IconPreviewPanel::setDesktop( SPDesktop* desktop )
         if ( this->desktop ) {
             docReplacedConn = this->desktop->connectDocumentReplaced(sigc::hide<0>(sigc::mem_fun(this, &IconPreviewPanel::setDocument)));
             if ( this->desktop->selection && Inkscape::Preferences::get()->getBool("/iconpreview/autoRefresh", true) ) {
-                selChangedConn = desktop->selection->connectChanged(sigc::hide(sigc::mem_fun(this, &IconPreviewPanel::queueRefresh)));
+                selChangedConn = this->desktop->selection->connectChanged(sigc::hide(sigc::mem_fun(this, &IconPreviewPanel::queueRefresh)));
             }
         }
     }
-- 
cgit v1.2.3