diff --git a/ChangeLog b/ChangeLog
index 26ff6e0f80..613111c05e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* demos/gtk-demo/textscroll.c:
+	* gtk/gtkiconview.c:
+	* gtk/gtkicontheme.c:
+	* gtk/gtkhandlebox.c:
+	* gtk/gtkfilechooserentry.c:
+	* gtk/gtkentrycompletion.c:
+	* gtk/gtkcolorsel.c: Fix some compiler warnings.
+
 2007-01-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c
index 063322141c..4dec2b4f6c 100644
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -109,7 +109,6 @@ setup_scroll (GtkTextView *textview,
 {
   GtkTextBuffer *buffer;
   GtkTextIter iter;
-  GtkTextMark *mark;
 
   buffer = gtk_text_view_get_buffer (textview);
   gtk_text_buffer_get_end_iter (buffer, &iter);
@@ -179,7 +178,6 @@ do_textscroll (GtkWidget *do_widget)
   if (!window)
     {
       GtkWidget *hbox;
-      GtkWidget *swindow;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       g_signal_connect (window, "destroy",
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 9b21d3258e..8c5520c018 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -788,6 +788,7 @@ palette_change_color (GtkWidget         *drawing_area,
   gdk_color.red = UNSCALE (color[0]);
   gdk_color.green = UNSCALE (color[1]);
   gdk_color.blue = UNSCALE (color[2]);
+  gdk_color.pixel = 0;
 
   x = 0;
   y = 0;			/* Quiet GCC */
@@ -1442,7 +1443,7 @@ get_screen_color (GtkWidget *button)
       gtk_widget_add_events (grab_widget,
                              GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK);
       
-      toplevel = gtk_widget_get_toplevel (colorsel);
+      toplevel = gtk_widget_get_toplevel (GTK_WIDGET (colorsel));
   
       if (GTK_IS_WINDOW (toplevel))
 	{
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index e779cf3c16..474b65764f 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -832,7 +832,7 @@ gtk_entry_completion_action_button_press (GtkWidget      *widget,
   if (!GTK_WIDGET_MAPPED (completion->priv->popup_window))
     return FALSE;
 
-  _gtk_entry_reset_im_context (completion->priv->entry);
+  _gtk_entry_reset_im_context (GTK_ENTRY (completion->priv->entry));
 
   if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
                                      event->x, event->y,
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 4beaf1a791..919da34691 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -646,8 +646,6 @@ out:
 static gboolean
 load_directory_callback (GtkFileChooserEntry *chooser_entry)
 {
-  GSList *child_paths = NULL;
-
   GDK_THREADS_ENTER ();
 
   chooser_entry->load_directory_idle = 0;
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 53e7619409..43a7edd79b 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -923,6 +923,9 @@ gtk_handle_box_paint (GtkWidget      *widget,
       rect.height = DRAG_HANDLE_SIZE;
       handle_orientation = GTK_ORIENTATION_HORIZONTAL;
       break;
+    default: 
+      g_assert_not_reached ();
+      break;
     }
 
   if (gdk_rectangle_intersect (event ? &event->area : area, &rect, &dest))
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 757b57e4f4..7a9072a800 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -877,7 +877,7 @@ insert_theme (GtkIconTheme *icon_theme, const char *theme_name)
   char **dirs;
   char **themes;
   GtkIconThemePrivate *priv;
-  IconTheme *theme;
+  IconTheme *theme = NULL;
   char *path;
   GKeyFile *theme_file;
   GError *error = NULL;
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 2991ef5615..0365d6d8ff 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8923,7 +8923,6 @@ gtk_icon_view_accessible_is_child_selected (AtkSelection *selection,
   GtkWidget *widget;
   GtkIconView *icon_view;
   GtkIconViewItem *item;
-  GList *l;
 
   widget = GTK_ACCESSIBLE (selection)->widget;
   if (widget == NULL)