diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/paramenum.cpp | 8 | ||||
| -rw-r--r-- | src/extension/paramradiobutton.cpp | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/extension/paramenum.cpp b/src/extension/paramenum.cpp index 8d779d1c2..1b1b83f6d 100644 --- a/src/extension/paramenum.cpp +++ b/src/extension/paramenum.cpp @@ -77,10 +77,16 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g const char * contents = sp_repr_children(child_repr)->content(); if (contents != NULL) newguitext = new Glib::ustring( _(contents) ); + else + continue; + const char * val = child_repr->attribute("value"); if (val != NULL) newvalue = new Glib::ustring(val); - if ( (newguitext) && (newvalue) ) { + else + newvalue = new Glib::ustring(contents); + + if ( (newguitext) && (newvalue) ) { // logical error if this is not true here choices = g_slist_append( choices, new enumentry(newvalue, newguitext) ); } } diff --git a/src/extension/paramradiobutton.cpp b/src/extension/paramradiobutton.cpp index ad18ce79f..1624bf587 100644 --- a/src/extension/paramradiobutton.cpp +++ b/src/extension/paramradiobutton.cpp @@ -71,12 +71,12 @@ ParamRadioButton::ParamRadioButton (const gchar * name, const gchar * guitext, c Inkscape::XML::Node *child_repr = sp_repr_children(xml); while (child_repr != NULL) { char const * chname = child_repr->name(); - if (!strcmp(chname, "option") || !strcmp(chname, "_option")) { + if (!strcmp(chname, "option")) { Glib::ustring * newguitext = NULL; Glib::ustring * newvalue = NULL; const char * contents = sp_repr_children(child_repr)->content(); if (contents != NULL) - newguitext = new Glib::ustring(contents); + newguitext = new Glib::ustring( _(contents) ); else continue; @@ -84,7 +84,7 @@ ParamRadioButton::ParamRadioButton (const gchar * name, const gchar * guitext, c if (val != NULL) newvalue = new Glib::ustring(val); else - newvalue = new Glib::ustring(*newguitext); + newvalue = new Glib::ustring(contents); if ( (newguitext) && (newvalue) ) { // logical error if this is not true here choices = g_slist_append( choices, new optionentry(newvalue, newguitext) ); |