update to trunk

(bzr r12588.1.39)

2 files changed, 14 insertions, 14 deletions

diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp
index 59dd6f254..e9e708f52 100644
--- a/src/trace/potrace/inkscape-potrace.cpp
+++ b/src/trace/potrace/inkscape-potrace.cpp
@@ -25,7 +25,7 @@
 #include "trace/imagemap-gdk.h"
 
 #include <inkscape.h>
-#include <desktop-handles.h>
+#include "desktop.h"
 #include "message-stack.h"
 #include <sp-path.h>
 #include <svg/path-string.h>
@@ -430,7 +430,7 @@ std::vector<TracingEngineResult> PotraceTracingEngine::traceSingle(GdkPixbuf * t
     if (!grayMap)
         return results;
 
-    long nodeCount;
+    long nodeCount = 0L;
     std::string d = grayMapToPath(grayMap, &nodeCount);
 
     grayMap->destroy(grayMap);
@@ -456,7 +456,7 @@ std::vector<TracingEngineResult> PotraceTracingEngine::traceGrayMap(GrayMap *gra
 
     brightnessFloor = 0.0; //important to set this
 
-    long nodeCount;
+    long nodeCount = 0L;
     std::string d = grayMapToPath(grayMap, &nodeCount);
 
     char const *style = "fill:#000000";
@@ -489,7 +489,7 @@ std::vector<TracingEngineResult> PotraceTracingEngine::traceBrightnessMulti(GdkP
               brightnessThreshold += delta) {
             GrayMap *grayMap = filter(*this, thePixbuf);
             if ( grayMap ) {
-                long nodeCount;
+                long nodeCount = 0L;
                 std::string d = grayMapToPath(grayMap, &nodeCount);
 
                 grayMap->destroy(grayMap);
@@ -510,7 +510,7 @@ std::vector<TracingEngineResult> PotraceTracingEngine::traceBrightnessMulti(GdkP
                     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
                     if (desktop) {
                         ustring msg = ustring::compose(_("Trace: %1.  %2 nodes"), traceCount++, nodeCount);
-                        sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
+                        desktop->getMessageStack()->flash(Inkscape::NORMAL_MESSAGE, msg);
                     }
                 }
             }
@@ -558,7 +558,7 @@ std::vector<TracingEngineResult> PotraceTracingEngine::traceQuant(GdkPixbuf * th
                 }
 
                 //## Now we have a traceable graymap
-                long nodeCount;
+                long nodeCount = 0L;
                 std::string d = grayMapToPath(gm, &nodeCount);
 
                 if ( !d.empty() ) {
@@ -573,7 +573,7 @@ std::vector<TracingEngineResult> PotraceTracingEngine::traceQuant(GdkPixbuf * th
                     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
                     if (desktop) {
                         ustring msg = ustring::compose(_("Trace: %1.  %2 nodes"), colorIndex, nodeCount);
-                        sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg);
+                        desktop->getMessageStack()->flash(Inkscape::NORMAL_MESSAGE, msg);
                     }
                 }
             }// for colorIndex
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index cb83541e3..cc3d000a3 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -16,7 +16,7 @@
 
 #include "inkscape.h"
 #include "desktop.h"
-#include "desktop-handles.h"
+
 #include "document.h"
 #include "document-undo.h"
 #include "message-stack.h"
@@ -51,9 +51,9 @@ SPImage *Tracer::getSelectedSPImage()
         return NULL;
         }
 
-    Inkscape::MessageStack *msgStack = sp_desktop_message_stack(desktop);
+    Inkscape::MessageStack *msgStack = desktop->getMessageStack();
 
-    Inkscape::Selection *sel = sp_desktop_selection(desktop);
+    Inkscape::Selection *sel = desktop->getSelection();
     if (!sel)
         {
         char *msg = _("Select an <b>image</b> to trace");
@@ -217,9 +217,9 @@ Glib::RefPtr<Gdk::Pixbuf> Tracer::sioxProcessImage(SPImage *img, Glib::RefPtr<Gd
         return Glib::RefPtr<Gdk::Pixbuf>(NULL);
         }
 
-    Inkscape::MessageStack *msgStack = sp_desktop_message_stack(desktop);
+    Inkscape::MessageStack *msgStack = desktop->getMessageStack();
 
-    Inkscape::Selection *sel = sp_desktop_selection(desktop);
+    Inkscape::Selection *sel = desktop->getSelection();
     if (!sel)
         {
         char *msg = _("Select an <b>image</b> to trace");
@@ -397,9 +397,9 @@ void Tracer::traceThread()
         return;
         }
 
-    Inkscape::MessageStack *msgStack = sp_desktop_message_stack(desktop);
+    Inkscape::MessageStack *msgStack = desktop->getMessageStack();
 
-    Inkscape::Selection *selection = sp_desktop_selection (desktop);
+    Inkscape::Selection *selection = desktop->getSelection();
 
     if (!SP_ACTIVE_DOCUMENT)
         {