diff options
Diffstat (limited to 'capplets')
| -rw-r--r-- | capplets/ui-properties/ChangeLog | 7 | ||||
| -rw-r--r-- | capplets/ui-properties/gnome-ui-properties.c | 10 | ||||
| -rw-r--r-- | capplets/ui-properties/gnome-ui-properties.glade | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog index 5af12b3f7..30991ef04 100644 --- a/capplets/ui-properties/ChangeLog +++ b/capplets/ui-properties/ChangeLog @@ -1,3 +1,10 @@ +2002-05-14 Michael Meeks <michael@ximian.com> + + * gnome-ui-properties.c + (toolbar_to_widget, set_toolbar_style): tolerate + bogus values sanely. + Update string to describe bonobo priority text + 2002-05-09 Jody Goldberg <jody@gnome.org> * gnome-ui-properties.glade : add a help button. diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c index d7533cba9..426e73537 100644 --- a/capplets/ui-properties/gnome-ui-properties.c +++ b/capplets/ui-properties/gnome-ui-properties.c @@ -41,7 +41,7 @@ static GConfEnumStringPair toolbar_style_enums[] = { { 1, "both_horiz" }, { 2, "icons" }, { 3, "text" }, - { -1, NULL }, + { -1, NULL } }; static GConfValue * @@ -65,9 +65,8 @@ toolbar_to_widget (GConfPropertyEditor *peditor, GConfValue *value) str = (value && (value->type == GCONF_VALUE_STRING)) ? gconf_value_get_string (value) : NULL; new_value = gconf_value_new (GCONF_VALUE_INT); - gconf_string_to_enum (toolbar_style_enums, - str, - &val); + if (!gconf_string_to_enum (toolbar_style_enums, str, &val)) + val = 0; gconf_value_set_int (new_value, val); return new_value; @@ -143,7 +142,8 @@ set_toolbar_style (GladeXML *dialog, const char *value) int enum_val; - gconf_string_to_enum (toolbar_style_enums, value, &enum_val); + if (!gconf_string_to_enum (toolbar_style_enums, value, &enum_val)) + enum_val = 0; gtk_toolbar_set_style (GTK_TOOLBAR (WID("toolbar_toolbar")), gtk_toolbar_styles[enum_val]); diff --git a/capplets/ui-properties/gnome-ui-properties.glade b/capplets/ui-properties/gnome-ui-properties.glade index 7d31df916..0ce7886d2 100644 --- a/capplets/ui-properties/gnome-ui-properties.glade +++ b/capplets/ui-properties/gnome-ui-properties.glade @@ -130,7 +130,7 @@ <child> <widget class="GtkMenuItem" id="convertwidget3"> <property name="visible">True</property> - <property name="label" translatable="yes">Text Beside Icons</property> + <property name="label" translatable="yes">Priority Text Beside Icons</property> <property name="use_underline">True</property> </widget> </child> |