update to trunk

(bzr r13879.1.17)

1 files changed, 4 insertions, 10 deletions

diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index b908a90cb..77f120e1a 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>
 
@@ -316,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)));
             }
         }
     }
@@ -366,16 +362,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 );
+                	std::vector<SPItem*> const items = sel->itemList();
+                    for(std::vector<SPItem*>::const_iterator i=items.begin();!target && i!=items.end();i++){
+                        SPItem* item = *i;
                         gchar const *id = item->getId();
                         if ( id ) {
                             targetId = id;
                             target = item;
                         }
-
-                        items = g_slist_next(items);
                     }
                 }
             }