gtk+ r21741 - in branches/gtk-2-14: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Oct 31 18:27:20 2008
New Revision: 21741
URL: http://svn.gnome.org/viewvc/gtk+?rev=21741&view=rev

Log:
2008-10-31  Matthias Clasen  <mclasen redhat com>

        Bug 558323 â glitches when popping up combos in treeviews

        gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_set_property):
        Don't set the model property on the combo box, since that leads
        to loops.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtkcellrenderercombo.c

Modified: branches/gtk-2-14/gtk/gtkcellrenderercombo.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkcellrenderercombo.c	(original)
+++ branches/gtk-2-14/gtk/gtkcellrenderercombo.c	Fri Oct 31 18:27:20 2008
@@ -267,32 +267,12 @@
   switch (prop_id)
     {
     case PROP_MODEL:
-      {
-	GObject *object;
-        GtkCellRendererComboPrivate *priv;
-
-        priv = GTK_CELL_RENDERER_COMBO_GET_PRIVATE (cell);
-
-	if (cell->model)
-	  {
-            if (priv->combo)
-              gtk_combo_box_set_model (GTK_COMBO_BOX (priv->combo), NULL);
-	    g_object_unref (cell->model);
-	    cell->model = NULL;
-	  }
-
-	object = g_value_get_object (value);
-        if (object)
-          {
-            g_return_if_fail (GTK_IS_TREE_MODEL (object));
-            g_object_ref (object);
-
-            cell->model = GTK_TREE_MODEL (object);
-            if (priv->combo)
-              gtk_combo_box_set_model (GTK_COMBO_BOX (priv->combo), cell->model);
-          }
-	break;
-      }
+      if (cell->model)
+        g_object_unref (cell->model);
+      cell->model = g_value_get_object (value);
+      if (cell->model)
+        g_object_ref (cell->model);
+      break;
     case PROP_TEXT_COLUMN:
       cell->text_column = g_value_get_int (value);
       break;