diff options
| author | Ed Halley <ed@halley.cc> | 2009-03-08 20:37:15 +0000 |
|---|---|---|
| committer | speare <speare@users.sourceforge.net> | 2009-03-08 20:37:15 +0000 |
| commit | 0dab4271d0ca744c89a5001e513a3760b8331d27 (patch) | |
| tree | ae07c172eceadbd48f4563af78bd2ef37809d856 /src/ui | |
| parent | Should be pointing to 047 really (diff) | |
| download | inkscape-0dab4271d0ca744c89a5001e513a3760b8331d27.tar.gz inkscape-0dab4271d0ca744c89a5001e513a3760b8331d27.zip | |
part of #339660; layers dialog allows non-unique inkscape:label attributes
(bzr r7443)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/layer-properties.cpp | 5 | ||||
| -rw-r--r-- | src/ui/dialog/layers.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp index ccd91fa2e..6cb0906a2 100644 --- a/src/ui/dialog/layer-properties.cpp +++ b/src/ui/dialog/layer-properties.cpp @@ -183,7 +183,8 @@ void LayerPropertiesDialog::Rename::perform(LayerPropertiesDialog &dialog) { SPDesktop *desktop=dialog._desktop; Glib::ustring name(dialog._layer_name_entry.get_text()); desktop->layer_manager->renameLayer( desktop->currentLayer(), - ( name.empty() ? NULL : (gchar *)name.c_str() ) + ( name.empty() ? NULL : (gchar *)name.c_str() ), + FALSE ); sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE, _("Rename layer")); @@ -212,7 +213,7 @@ void LayerPropertiesDialog::Create::perform(LayerPropertiesDialog &dialog) { Glib::ustring name(dialog._layer_name_entry.get_text()); if (!name.empty()) { - desktop->layer_manager->renameLayer( new_layer, (gchar *)name.c_str() ); + desktop->layer_manager->renameLayer( new_layer, (gchar *)name.c_str(), TRUE ); } sp_desktop_selection(desktop)->clear(); desktop->setCurrentLayer(new_layer); diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 680a53e97..d79f18801 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -539,7 +539,7 @@ void LayersPanel::_handleRowChange( Gtk::TreeModel::Path const& /*path*/, Gtk::T gchar const* oldLabel = obj->label(); Glib::ustring tmp = row[_model->_colLabel]; if ( oldLabel && oldLabel[0] && !tmp.empty() && (tmp != oldLabel) ) { - _mgr->renameLayer( obj, tmp.c_str() ); + _mgr->renameLayer( obj, tmp.c_str(), FALSE ); row[_model->_colLabel] = obj->label(); } } |