2009-03-16 Claudio Saavedra <csaavedra@igalia.com>

[hildon] / src / hildon-time-selector.c

diff --git a/src/hildon-time-selector.c b/src/hildon-time-selector.c
index 7ebf1d3..ad8f5cf 100644 (file)
--- a/src/hildon-time-selector.c
+++ b/src/hildon-time-selector.c
@@ -123,7 +123,8 @@ static void _manage_ampm_selection_cb (HildonTouchSelector * selector,
 static void _check_ampm_format (HildonTimeSelector * selector);
 static void _set_pm (HildonTimeSelector * selector, gboolean pm);
 
-static gchar *_custom_print_func (HildonTouchSelector * selector);
+static gchar *_custom_print_func (HildonTouchSelector * selector,
+                                  gpointer user_data);
 
 static void
 hildon_time_selector_class_init (HildonTimeSelectorClass * class)
@@ -274,10 +275,6 @@ hildon_time_selector_set_property (GObject *object,
 static void
 hildon_time_selector_finalize (GObject * object)
 {
-  HildonTimeSelector *selector = NULL;
-
-  selector = HILDON_TIME_SELECTOR (object);
-
   /* FIXME: FILL ME !! */
 
   (*G_OBJECT_CLASS (hildon_time_selector_parent_class)->finalize) (object);
@@ -286,7 +283,8 @@ hildon_time_selector_finalize (GObject * object)
 /* ------------------------------ PRIVATE METHODS ---------------------------- */
 
 static gchar *
-_custom_print_func (HildonTouchSelector * touch_selector)
+_custom_print_func (HildonTouchSelector * touch_selector,
+                    gpointer user_data)
 {
   gchar *result = NULL;
   struct tm tm = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -431,10 +429,10 @@ _manage_ampm_selection_cb (HildonTouchSelector * touch_selector,
   g_return_if_fail (HILDON_IS_TIME_SELECTOR (touch_selector));
   selector = HILDON_TIME_SELECTOR (touch_selector);
 
-  if (num_column == COLUMN_AMPM) {
-    hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (selector),
-                                        COLUMN_AMPM, &iter);
-    gtk_tree_model_get (selector->priv->ampm_model, &iter, COLUMN_INT, &pm, -1);
+  if (num_column == COLUMN_AMPM &&
+      hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (selector),
+                                         COLUMN_AMPM, &iter)) {
+     gtk_tree_model_get (selector->priv->ampm_model, &iter, COLUMN_INT, &pm, -1);
 
     selector->priv->pm = pm;
   }
@@ -531,8 +529,8 @@ hildon_time_selector_set_time (HildonTimeSelector * selector,
   GtkTreeIter iter;
   gint hours_item = 0;
 
-  g_return_val_if_fail (hours >= 0 && hours <= 23, FALSE);
-  g_return_val_if_fail (minutes >= 0 && minutes <= 59, FALSE);
+  g_return_val_if_fail (hours <= 23, FALSE);
+  g_return_val_if_fail (minutes <= 59, FALSE);
 
   if (selector->priv->ampm_format) {
     _set_pm (selector, hours >= 12);