diff --git a/ChangeLog b/ChangeLog
index 3cb09e3d31..9ec7927dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 22 01:16:23 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c: Avoid some warnings.
+
 Thu Jul 22 01:05:16 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Require Pango 1.5.1 (for ellipsisation).
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3cb09e3d31..9ec7927dbd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu Jul 22 01:16:23 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c: Avoid some warnings.
+
 Thu Jul 22 01:05:16 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Require Pango 1.5.1 (for ellipsisation).
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3cb09e3d31..9ec7927dbd 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Thu Jul 22 01:16:23 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c: Avoid some warnings.
+
 Thu Jul 22 01:05:16 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Require Pango 1.5.1 (for ellipsisation).
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3cb09e3d31..9ec7927dbd 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu Jul 22 01:16:23 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkcombobox.c: Avoid some warnings.
+
 Thu Jul 22 01:05:16 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Require Pango 1.5.1 (for ellipsisation).
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 78dbdb05e1..576b1906ec 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2426,13 +2426,13 @@ gtk_combo_box_menu_row_inserted (GtkTreeModel *model,
   menu = combo_box->priv->popup_widget;
   g_return_if_fail (GTK_IS_MENU (menu));
 
-  cell_view = gtk_cell_view_new ();
+  cell_view = GTK_CELL_VIEW (gtk_cell_view_new ());
   gtk_cell_view_set_model (cell_view, model);
   gtk_cell_view_set_displayed_row (cell_view, path);
   gtk_widget_show (GTK_WIDGET (cell_view));
   
   item = gtk_menu_item_new ();
-  gtk_container_add (GTK_CONTAINER (item), cell_view);
+  gtk_container_add (GTK_CONTAINER (item), GTK_WIDGET (cell_view));
 
   g_signal_connect (item, "activate",
                     G_CALLBACK (gtk_combo_box_menu_item_activate),