diff options
| author | Ralf Stephan <ralf@ark.in-berlin.de> | 2006-03-28 08:31:37 +0000 |
|---|---|---|
| committer | rwst <rwst@users.sourceforge.net> | 2006-03-28 08:31:37 +0000 |
| commit | d80ffcceedfb6d1c2f74d6d7b39360f79a393379 (patch) | |
| tree | 7ef74343a75345df150a3cab61cce57d66215c57 /src | |
| parent | Experimenting with linked colors. (diff) | |
| download | inkscape-d80ffcceedfb6d1c2f74d6d7b39360f79a393379.tar.gz inkscape-d80ffcceedfb6d1c2f74d6d7b39360f79a393379.zip | |
try to fix g++ 4.1 compile errors
(bzr r317)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/align-and-distribute.cpp | 2 | ||||
| -rw-r--r-- | src/ui/view/edit-widget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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); |