From: Michael Dominic Kostrzewa Date: Wed, 7 Feb 2007 11:52:35 +0000 (+0000) Subject: Prefixing the number editor enums with HILDON_NUMBER_EDITOR_ERROR_. X-Git-Tag: 2.1.66-1~956 X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=840b15e07956ea86e0cce1f886c1cc9b59261498;p=hildon Prefixing the number editor enums with HILDON_NUMBER_EDITOR_ERROR_. --- diff --git a/ChangeLog.2 b/ChangeLog.2 index 359c98a..5bde049 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,5 +1,12 @@ 2007-02-07 Michael Dominic Kostrzewa + * src/hildon-number-editor.c: + * src/hildon-number-editor.h: Prefixing the number editor enums with + HILDON_NUMBER_EDITOR_ERROR_. Not sure why I haven't really noticed + this before. + +2007-02-07 Michael Dominic Kostrzewa + * src/hildon-color-chooser-dialog.c: * src/hildon-color-chooser.c: Small documentation fixes. diff --git a/src/hildon-number-editor.c b/src/hildon-number-editor.c index 0d84e44..ae96d40 100644 --- a/src/hildon-number-editor.c +++ b/src/hildon-number-editor.c @@ -613,23 +613,23 @@ hildon_number_editor_validate_value (HildonNumberEditor *editor, */ if (value > priv->end && (priv->end >= 0 || (priv->end < 0 && value >= 0))) { - error_code = MAXIMUM_VALUE_EXCEED; + error_code = HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED; fixup_value = priv->end; } else if (value < priv->start && (priv->start < 0 || (priv->start >= 0 && value <= 0))) { - error_code = MINIMUM_VALUE_EXCEED; + error_code = HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED; fixup_value = priv->start; } } else { if (value > priv->end) { - error_code = MAXIMUM_VALUE_EXCEED; + error_code = HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED; fixup_value = priv->end; } else if (value < priv->start) { - error_code = MINIMUM_VALUE_EXCEED; + error_code = HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED; fixup_value = priv->start; } } @@ -638,10 +638,10 @@ hildon_number_editor_validate_value (HildonNumberEditor *editor, have plain '-', intermediate forms are allowed AND minimum bound is negative */ else if (! allow_intermediate || strcmp (text, "-") != 0 || priv->start >= 0) - error_code = ERRONEOUS_VALUE; + error_code = HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE; } else if (! allow_intermediate) - error_code = ERRONEOUS_VALUE; + error_code = HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE; if (error_code != -1) { @@ -827,15 +827,15 @@ hildon_number_editor_range_error (HildonNumberEditor *editor, /* Construct error message */ switch (type) { - case MAXIMUM_VALUE_EXCEED: + case HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED: err_msg = g_strdup_printf (_("ckct_ib_maximum_value"), max, max); break; - case MINIMUM_VALUE_EXCEED: + case HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED: err_msg = g_strdup_printf (_("ckct_ib_minimum_value"), min, min); break; - case ERRONEOUS_VALUE: + case HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE: err_msg = g_strdup_printf (_("ckct_ib_set_a_value_within_range"), min, max); break; diff --git a/src/hildon-number-editor.h b/src/hildon-number-editor.h index 40b0600..b78eac3 100644 --- a/src/hildon-number-editor.h +++ b/src/hildon-number-editor.h @@ -57,12 +57,11 @@ struct _HildonNumberEditor GtkContainer parent; }; -/* FIXME Needs documentation */ typedef enum { - MAXIMUM_VALUE_EXCEED, - MINIMUM_VALUE_EXCEED, - ERRONEOUS_VALUE + HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED, + HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED, + HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE } HildonNumberEditorErrorType; struct _HildonNumberEditorClass