diff --git a/ChangeLog b/ChangeLog
index ae42fddf15..ec15707df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-04  Johan Dahlin  <johan@gnome.org>
+
+	* gtk/gtk.symbols: Remove symbols accidentally added.
+	* gtk/gtkentryprivate.h: Add boolean property popup_set_width
+	* gtk/gtktoggletoolbutton.c: (gtk_toggle_tool_button_class_init):
+	Use object_class instead of gobject_class
+
 Mon Apr  4 12:14:35 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ae42fddf15..ec15707df8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-04-04  Johan Dahlin  <johan@gnome.org>
+
+	* gtk/gtk.symbols: Remove symbols accidentally added.
+	* gtk/gtkentryprivate.h: Add boolean property popup_set_width
+	* gtk/gtktoggletoolbutton.c: (gtk_toggle_tool_button_class_init):
+	Use object_class instead of gobject_class
+
 Mon Apr  4 12:14:35 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ae42fddf15..ec15707df8 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-04-04  Johan Dahlin  <johan@gnome.org>
+
+	* gtk/gtk.symbols: Remove symbols accidentally added.
+	* gtk/gtkentryprivate.h: Add boolean property popup_set_width
+	* gtk/gtktoggletoolbutton.c: (gtk_toggle_tool_button_class_init):
+	Use object_class instead of gobject_class
+
 Mon Apr  4 12:14:35 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 02ccc6ecca..311cd78d17 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1654,15 +1654,12 @@ gtk_icon_theme_set_search_path_utf8
 #if IN_FILE(__GTK_ICON_VIEW_C__)
 gtk_icon_view_get_column_spacing
 gtk_icon_view_get_columns
-gtk_icon_view_set_cursor
-gtk_icon_view_get_cursor
 gtk_icon_view_get_item_width
 gtk_icon_view_get_margin
 gtk_icon_view_get_markup_column
 gtk_icon_view_get_model
 gtk_icon_view_get_orientation
 gtk_icon_view_get_path_at_pos
-gtk_icon_view_get_item_at_pos
 gtk_icon_view_get_pixbuf_column
 gtk_icon_view_get_row_spacing
 gtk_icon_view_get_selected_items
diff --git a/gtk/gtkentryprivate.h b/gtk/gtkentryprivate.h
index 7fb369b9ca..43eff46b08 100644
--- a/gtk/gtkentryprivate.h
+++ b/gtk/gtkentryprivate.h
@@ -61,7 +61,7 @@ struct _GtkEntryCompletionPrivate
   guint has_completion    : 1;
   guint inline_completion : 1;
   guint popup_completion  : 1;
-
+  guint popup_set_width   : 1;
   GSource *check_completion_idle;
 };
 
diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c
index 286976d2d0..0485cbe270 100644
--- a/gtk/gtktoggletoolbutton.c
+++ b/gtk/gtktoggletoolbutton.c
@@ -125,7 +125,7 @@ gtk_toggle_tool_button_class_init (GtkToggleToolButtonClass *klass)
    *
    * Since: 2.8
    */
-  g_object_class_install_property (gobject_class,
+  g_object_class_install_property (object_class,
                                    PROP_ACTIVE,
                                    g_param_spec_boolean ("active",
 							 P_("Active"),