Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/clock/ChangeLog,v
retrieving revision 1.524
diff -u -u -r1.524 ChangeLog
--- ChangeLog	11 Mar 2004 12:34:31 -0000	1.524
+++ ChangeLog	11 Mar 2004 14:05:31 -0000
@@ -1,3 +1,9 @@
+2004-03-11  Fernando Herrera  <fherrera@onirica.com>
+
+	* clock.c: (set_format_cb), (display_properties_dialog):
+	Fix bug introduced by the last comit. Now valid values 
+	for ClockFormat begin from 1.
+
 2004-03-11  Mark McLoughlin  <mark@skynet.ie>
 
 	* clock.c: (fill_clock_applet): don't assume enums
Index: clock.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/clock/clock.c,v
retrieving revision 1.136
diff -u -u -r1.136 clock.c
--- clock.c	11 Mar 2004 12:34:31 -0000	1.136
+++ clock.c	11 Mar 2004 14:05:37 -0000
@@ -2089,7 +2089,8 @@
 {
         ClockFormat format;
 
-        format = gtk_combo_box_get_active (combo);
+	/* valid values begin from 1 */
+        format = gtk_combo_box_get_active (combo) + 1;
 
         update_properties_for_format (cd, combo, format);
 
@@ -2309,7 +2310,8 @@
 
         update_properties_for_format (cd, GTK_COMBO_BOX (combo), cd->format);
 
-	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), cd->format);
+	/* valid values begin from 1 */
+	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), cd->format - 1);
         g_signal_connect (combo, "changed",
                           G_CALLBACK (set_format_cb), cd);
 
