diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2013-01-23 21:21:28 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2013-01-23 21:21:28 +0000 |
| commit | 70467baaabf4efc3f76297058a358c04212419c2 (patch) | |
| tree | 727782add478ac2a74610ebaed398ae17e6398c4 /src | |
| parent | fix Memory leak in bitmap trace (Bug #996695) (diff) | |
| download | inkscape-70467baaabf4efc3f76297058a358c04212419c2.tar.gz inkscape-70467baaabf4efc3f76297058a358c04212419c2.zip | |
revert my revision 12053 (Bug #1103248 )
(bzr r12058)
Diffstat (limited to 'src')
| -rw-r--r-- | src/document.cpp | 2 | ||||
| -rw-r--r-- | src/extension/execution-env.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/icon-preview.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/document.cpp b/src/document.cpp index 25ad735e1..172037518 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -862,7 +862,7 @@ SPDocument::removeUndoObserver(Inkscape::UndoStackObserver& observer) SPObject *SPDocument::getObjectById(Glib::ustring const &id) const { - return getObjectById( id ); + return getObjectById( id.c_str() ); } SPObject *SPDocument::getObjectById(gchar const *id) const diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index 78129cbc5..4058fd787 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -195,7 +195,7 @@ ExecutionEnv::reselect (void) { Inkscape::Selection * selection = sp_desktop_selection(desktop); for (std::list<Glib::ustring>::iterator i = _selected.begin(); i != _selected.end(); ++i) { - SPObject * obj = doc->getObjectById(*i); + SPObject * obj = doc->getObjectById(i->c_str()); if (obj != NULL) { selection->add(obj); } diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index 16ea5c283..de213ca85 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -352,7 +352,7 @@ void IconPreviewPanel::refreshPreview() SPObject *target = 0; if ( selectionButton && selectionButton->get_active() ) { - target = (hold && !targetId.empty()) ? desktop->doc()->getObjectById( targetId ) : 0; + target = (hold && !targetId.empty()) ? desktop->doc()->getObjectById( targetId.c_str() ) : 0; if ( !target ) { targetId.clear(); Inkscape::Selection * sel = sp_desktop_selection(desktop); |