From: rwst <rwst@users.sourceforge.net>
Date: Tue, 28 Mar 2006 08:31:37 +0000 (+0000)
Subject: try to fix g++ 4.1 compile errors
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ca6d3d51fd675fba121c08465ba925f123b17f5;p=inkscape.git

try to fix g++ 4.1 compile errors
---

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 35ee7b806..4acbbbb43 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -1074,7 +1074,7 @@ std::list<SPItem *>::iterator AlignAndDistribute::find_master( std::list<SPItem
         break;
 
     } // end of switch statement
-    return NULL;
+    return master;
 }
 
 AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const {
diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index e422911a5..dbac65938 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -1557,7 +1557,7 @@ EditWidget::initEdit (SPDocument *doc)
 
     /// \todo convert to sigc++ when SPObject hierarchy gets converted
     /* Listen on namedview modification */
-    g_signal_connect (G_OBJECT (_desktop->namedview), "modified", G_CALLBACK (_namedview_modified), this);
+    g_signal_connect (G_OBJECT (_desktop->namedview), "modified", G_CALLBACK (Inkscape::UI::View::_namedview_modified), this);
     _layer_selector.setDesktop (_desktop);
     _selected_style_status.setDesktop (_desktop);