diff --git a/ChangeLog b/ChangeLog
index 3f248692fb..5b1d2fa97b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-12-14  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testcombo.c (main): Don't use gtk_cell_renderer_set_values().
+
+	* gtk/gtk.symbols: 
+	* gtk/gtkcellview.[hc]: Remove gtk_cell_renderer_set_value[s]
+	for now.
+
 	* configure.in: Bump version to 2.6.0
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3f248692fb..5b1d2fa97b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2004-12-14  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testcombo.c (main): Don't use gtk_cell_renderer_set_values().
+
+	* gtk/gtk.symbols: 
+	* gtk/gtkcellview.[hc]: Remove gtk_cell_renderer_set_value[s]
+	for now.
+
 	* configure.in: Bump version to 2.6.0
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3f248692fb..5b1d2fa97b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
 2004-12-14  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testcombo.c (main): Don't use gtk_cell_renderer_set_values().
+
+	* gtk/gtk.symbols: 
+	* gtk/gtkcellview.[hc]: Remove gtk_cell_renderer_set_value[s]
+	for now.
+
 	* configure.in: Bump version to 2.6.0
 
 	* NEWS: Updates
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3f248692fb..5b1d2fa97b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2004-12-14  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testcombo.c (main): Don't use gtk_cell_renderer_set_values().
+
+	* gtk/gtk.symbols: 
+	* gtk/gtkcellview.[hc]: Remove gtk_cell_renderer_set_value[s]
+	for now.
+
 	* configure.in: Bump version to 2.6.0
 
 	* NEWS: Updates
diff --git a/tests/testcombo.c b/tests/testcombo.c
index 232b4372c1..528e9ca7e8 100644
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -916,25 +916,13 @@ main (int argc, char **argv)
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
                                     renderer,
                                     FALSE);
-        g_value_init (&value, GDK_TYPE_PIXBUF);
-        g_value_set_instance (&value, pixbuf);
-        gtk_cell_view_set_values (GTK_CELL_VIEW (cellview),
-                                  renderer,
-                                  "pixbuf", &value,
-                                  NULL);
-        g_value_unset (&value);
+        g_object_set (renderer, "pixbuf", pixbuf, NULL);
 
         renderer = gtk_cell_renderer_text_new ();
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
                                     renderer,
                                     TRUE);
-        g_value_init (&value, G_TYPE_STRING);
-        g_value_set_string (&value, "la la la");
-        gtk_cell_view_set_values (GTK_CELL_VIEW (cellview),
-                                  renderer,
-                                  "text", &value,
-                                  NULL);
-        g_value_unset (&value);
+        g_object_set (renderer, "text", "la la la", NULL);
         gtk_container_add (GTK_CONTAINER (boom), cellview);
 
         /* GtkComboBox list */