[maemo-commits] [maemo-commits] r9706 - in projects/haf/branches/hildon-libs/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-02-07 13:52:35 +0200 (Wed, 07 Feb 2007)
New Revision: 9706

Modified:
   projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
   projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c
   projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.h
Log:
Prefixing the number editor enums with HILDON_NUMBER_EDITOR_ERROR_.


Modified: projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-02-07 11:35:26 UTC (rev 9705)
+++ projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-02-07 11:52:35 UTC (rev 9706)
@@ -1,5 +1,12 @@
 2007-02-07  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* 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  <michael.kostrzewa at nokia.com> 
+
 	* src/hildon-color-chooser-dialog.c:
 	* src/hildon-color-chooser.c: Small documentation fixes.
 

Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c	2007-02-07 11:35:26 UTC (rev 9705)
+++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c	2007-02-07 11:52:35 UTC (rev 9706)
@@ -613,23 +613,23 @@
                  */
                 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 @@
            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 @@
     /* 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;

Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.h
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.h	2007-02-07 11:35:26 UTC (rev 9705)
+++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.h	2007-02-07 11:52:35 UTC (rev 9706)
@@ -57,12 +57,11 @@
     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