update to trunk

(bzr r11950.1.234)

4 files changed, 4 insertions, 4 deletions

diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index e896b9840..340a3dad0 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -813,7 +813,7 @@ void Export::onAreaToggled ()
                     /* If we still don't have a filename -- let's build
                        one that's nice */
                     if (filename.empty()) {
-                        const gchar * id = NULL;
+                        const gchar * id = "object";
                         const GSList * reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList();
                         for(; reprlst != NULL; reprlst = reprlst->next) {
                             Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data;
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index 80cc75e79..2e345fef1 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -515,7 +515,7 @@ bool Box3dTool::root_handler(GdkEvent* event) {
     return ret;
 }
 
-void Box3dTool::drag(guint state) {
+void Box3dTool::drag(guint /*state*/) {
     if (!this->box3d) {
         if (Inkscape::have_viable_layer(desktop, this->message_context) == false) {
             return;
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 8a950b528..7e33b1a4c 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -625,7 +625,7 @@ void NodeTool::select_area(Geom::Rect const &sel, GdkEventButton *event) {
     }
 }
 
-void NodeTool::select_point(Geom::Point const &sel, GdkEventButton *event) {
+void NodeTool::select_point(Geom::Point const &/*sel*/, GdkEventButton *event) {
     using namespace Inkscape::UI; // pull in event helpers
 
     if (!event) {
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index 26e47abbb..55683871d 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -148,7 +148,7 @@ struct EditWidgetInterface
     virtual bool showInfoDialog( Glib::ustring const &message ) = 0;
 
     /// Open yes/no dialog with warning text and confirmation question.
-    virtual bool warnDialog (gchar*) = 0;
+    virtual bool warnDialog (Glib::ustring const &) = 0;
 
     virtual Inkscape::UI::Widget::Dock* getDock () = 0;
 };