X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=hildon%2Fhildon-touch-selector-entry.c;h=87663b7e58ddcedaa51fd1e77047fc65bc39bcfd;hb=b21ccb063e5791d68bd15fee469bd4ed550806fa;hp=9e4913d4b613514f3dd88cb8053036ecbf7815b7;hpb=69a11338fe0cc36a868e5812b590f5437622988a;p=hildon

diff --git a/hildon/hildon-touch-selector-entry.c b/hildon/hildon-touch-selector-entry.c
index 9e4913d..87663b7 100644
--- a/hildon/hildon-touch-selector-entry.c
+++ b/hildon/hildon-touch-selector-entry.c
@@ -1,7 +1,7 @@
 /*
  * This file is a part of hildon
  *
- * Copyright (C) 2008 Nokia Corporation.
+ * Copyright (C) 2008, 2009 Nokia Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -121,11 +121,15 @@ hildon_touch_selector_entry_class_init (HildonTouchSelectorEntryClass *klass)
   /**
    * HildonTouchSelectorEntry:text-column:
    *
-   * Deprecated: now this property is in HildonTouchSelectorColumn use
-   * hildon_touch_selector_entry_set_text_column() and
-   * hildon_touch_selector_entry_get_text_column() to manage this.
+   * A column in the data source model to get the strings from.
    *
-   * Since: 2.2
+   * This property is deprecated. Use HildonTouchSelectorColumn:text-column
+   * instead. Use hildon_touch_selector_entry_set_text_column() and
+   * hildon_touch_selector_entry_get_text_column() to manage it.
+   *
+   * Deprecated: use HildonTouchSelectorColumn:text-column instead
+   *
+   * Since: maemo 2.2
    **/
   g_object_class_install_property (G_OBJECT_CLASS (klass),
                                    PROP_TEXT_COLUMN,
@@ -171,7 +175,7 @@ hildon_touch_selector_entry_init (HildonTouchSelectorEntry *self)
 
   priv = HILDON_TOUCH_SELECTOR_ENTRY_GET_PRIVATE (self);
 
-  priv->entry = hildon_entry_new (HILDON_SIZE_AUTO);
+  priv->entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT);
   gtk_entry_set_activates_default (GTK_ENTRY (priv->entry), TRUE);
   input_mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (priv->entry));
 
@@ -289,7 +293,7 @@ hildon_touch_selector_entry_set_text_column (HildonTouchSelectorEntry *selector,
 
   column = hildon_touch_selector_get_column (HILDON_TOUCH_SELECTOR (selector), 0);
 
-  g_object_set (G_OBJECT (column), "text-column", text_column, NULL);
+  hildon_touch_selector_column_set_text_column (column, text_column);
 }
 
 /**
@@ -313,7 +317,7 @@ hildon_touch_selector_entry_get_text_column (HildonTouchSelectorEntry *selector)
   column = hildon_touch_selector_get_column (HILDON_TOUCH_SELECTOR (selector),
                                              0);
 
-  g_object_get (G_OBJECT (column), "text-column", &text_column, NULL);
+  text_column = hildon_touch_selector_column_get_text_column (column);
 
   return text_column;
 }