2008-08-12 Alberto Garcia <agarcia@igalia.com>

* examples/hildon-pannable-area-touch-list-example.c
	(create_tree_view)
	* examples/hildon-pannable-area-touch-grid-example.c
	(create_icon_view): Use gtk_{tree,icon}_view_new() and
	hildon_gtk_{tree,icon}_view_new() instead of g_object_new().
	Fix memory leak when setting the tree model.

diff --git a/ChangeLog b/ChangeLog
index 9ee4723..5758e78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-12  Alberto Garcia  <agarcia@igalia.com>
+
+       * examples/hildon-pannable-area-touch-list-example.c
+       (create_tree_view)
+       * examples/hildon-pannable-area-touch-grid-example.c
+       (create_icon_view): Use gtk_{tree,icon}_view_new() and
+       hildon_gtk_{tree,icon}_view_new() instead of g_object_new().
+       Fix memory leak when setting the tree model.
+
 2008-08-12  Kimmo Hämäläinen <kimmo.hamalainen@nokia.com>
 
        Released 2.1.4

diff --git a/examples/hildon-pannable-area-touch-grid-example.c b/examples/hildon-pannable-area-touch-grid-example.c
index ed36d74..b4e768e 100644 (file)
--- a/examples/hildon-pannable-area-touch-grid-example.c
+++ b/examples/hildon-pannable-area-touch-grid-example.c
@@ -70,12 +70,19 @@ create_icon_view (HildonUIMode  mode,
 {
   GtkWidget *icon_view;
   GtkCellRenderer *renderer;
+  GtkTreeModel *model;
 
-  icon_view = g_object_new (GTK_TYPE_ICON_VIEW,
-                            "model", create_model (),
-                            "name", name,
-                            "hildon-ui-mode", mode,
-                            NULL);
+  if (name && g_str_equal (name, "fremantle-widget"))
+      icon_view = hildon_gtk_icon_view_new (mode);
+  else
+      icon_view = gtk_icon_view_new ();
+
+  if (name)
+    gtk_widget_set_name (icon_view, name);
+
+  model = create_model ();
+  gtk_icon_view_set_model (GTK_ICON_VIEW (icon_view), model);
+  g_object_unref (model);
 
   if (multi_select)
     gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),

diff --git a/examples/hildon-pannable-area-touch-list-example.c b/examples/hildon-pannable-area-touch-list-example.c
index 8b65d6f..44a3090 100644 (file)
--- a/examples/hildon-pannable-area-touch-list-example.c
+++ b/examples/hildon-pannable-area-touch-list-example.c
@@ -80,13 +80,21 @@ create_tree_view (HildonUIMode  mode,
   GtkWidget *tree_view;
   GtkCellRenderer *renderer;
   GtkTreeSelection *selection;
+  GtkTreeModel *model;
 
-  tree_view = g_object_new (GTK_TYPE_TREE_VIEW,
-                            "model", create_model (),
-                            "name", name,
-                            "hildon-ui-mode", mode,
-                            "rules-hint", TRUE,
-                            NULL);
+  if (name && g_str_equal (name, "fremantle-widget"))
+      tree_view = hildon_gtk_tree_view_new (mode);
+  else
+      tree_view = gtk_tree_view_new ();
+
+  if (name)
+    gtk_widget_set_name (tree_view, name);
+
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE);
+
+  model = create_model ();
+  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model);
+  g_object_unref (model);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
   if (multi_select)