2008-09-04 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-touch-selector.c:
	(hildon_touch_selector_remove_column): Remove from the correct parent
	and also remove the list element and free it.
	Fixes: NB#88049

diff --git a/ChangeLog b/ChangeLog
index d33d888..13ee3e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-04  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * src/hildon-touch-selector.c:
+       (hildon_touch_selector_remove_column): Remove from the correct parent
+       and also remove the list element and free it.
+       Fixes: NB#88049
+
 2008-09-04  Alejandro Pinheiro  <apinheiro@igalia.com>
 
        * src/hildon-time-selector.c

diff --git a/configure.ac b/configure.ac
index b4a3e72..b8709a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_SUBST(API_VERSION_MAJOR)
 #    increment current, and set revision to 0.
 # 5. If any interfaces have been added since the last public release, then increment age.
 # 6. If any interfaces have been removed since the last public release, then set age to 0.  
-AS_LIBTOOL(HILDON, 18, 1, 18)
+AS_LIBTOOL(HILDON, 19, 0, 0)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC

diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c
index 4ad3cc3..7da9112 100644 (file)
--- a/src/hildon-touch-selector.c
+++ b/src/hildon-touch-selector.c
@@ -678,14 +678,18 @@ gboolean
 hildon_touch_selector_remove_column (HildonTouchSelector * selector, gint column)
 {
   SelectorColumn *current_column = NULL;
+  HildonTouchSelectorPrivate *priv;
 
   g_return_val_if_fail (HILDON_IS_TOUCH_SELECTOR (selector), FALSE);
   g_return_val_if_fail (column <
                         hildon_touch_selector_get_num_columns (selector), FALSE);
 
-  current_column = g_slist_nth_data (selector->priv->columns, column);
+  priv = HILDON_TOUCH_SELECTOR_GET_PRIVATE (selector);
+  current_column = g_slist_nth_data (priv->columns, column);
 
-  gtk_container_remove (GTK_CONTAINER (selector), current_column->panarea);
+  gtk_container_remove (GTK_CONTAINER (priv->hbox), current_column->panarea);
+  priv->columns = g_slist_remove (priv->columns, current_column);
+  g_free (current_column);
 
   return TRUE;
 }