diff --git a/ChangeLog b/ChangeLog
index 4d51c745ce..3e65b8de4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c: Warning fixes.  (#147420,
+	Morten Welinder)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_destroy): Pop down 
+	first. (#147399, John Cupitt)
+
 Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4d51c745ce..3e65b8de4e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c: Warning fixes.  (#147420,
+	Morten Welinder)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_destroy): Pop down 
+	first. (#147399, John Cupitt)
+
 Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4d51c745ce..3e65b8de4e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c: Warning fixes.  (#147420,
+	Morten Welinder)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_destroy): Pop down 
+	first. (#147399, John Cupitt)
+
 Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4d51c745ce..3e65b8de4e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-07-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkentrycompletion.c: Warning fixes.  (#147420,
+	Morten Welinder)
+
+	* gtk/gtkcombobox.c (gtk_combo_box_destroy): Pop down 
+	first. (#147399, John Cupitt)
+
 Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 26a2584128..fc86ac3249 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1089,7 +1089,7 @@ gtk_entry_completion_set_text_column (GtkEntryCompletion *completion,
                                  cell,
                                  "text", column);
 
-  g_object_notify (completion, "text_column");
+  g_object_notify (G_OBJECT (completion), "text_column");
 }
 
 /**
@@ -1105,7 +1105,7 @@ gtk_entry_completion_set_text_column (GtkEntryCompletion *completion,
 gint
 gtk_entry_completion_get_text_column (GtkEntryCompletion *completion)
 {
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (completion));
+  g_return_val_if_fail (GTK_IS_ENTRY_COMPLETION (completion), -1);
 
   return completion->priv->text_column;  
 }