Apply a cleanup patch by Kjartan Maraas (#341812)

2006-10-08  Matthias Clasen  <mclasen@redhat.com>

	* Apply a cleanup patch by Kjartan Maraas  (#341812)

58 files changed, 99 insertions, 285 deletions

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 7eda3041e4..eeefd2e887 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -178,11 +178,9 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
 {
   GObjectClass *object_class;
   GtkWidgetClass *widget_class;
-  GtkDialogClass *dialog_class;
 	
   object_class = (GObjectClass *)klass;
   widget_class = (GtkWidgetClass *)klass;
-  dialog_class = (GtkDialogClass *)klass;
 	
   object_class->set_property = gtk_about_dialog_set_property;
   object_class->get_property = gtk_about_dialog_get_property;
@@ -1752,12 +1750,9 @@ set_cursor_if_appropriate (GtkAboutDialog *about,
 {
   GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
   GSList *tags = NULL, *tagp = NULL;
-  GtkTextBuffer *buffer;
   GtkTextIter iter;
   gboolean hovering_over_link = FALSE;
 
-  buffer = gtk_text_view_get_buffer (text_view);
-
   gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
   
   tags = gtk_text_iter_get_tags (&iter);
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 265585ed63..4756035ae2 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -37,7 +37,6 @@
 #ifdef G_OS_WIN32
 #include <io.h>
 #endif
-#include <errno.h>
 
 
 /* --- structures --- */
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 630159b3a2..8c89b61138 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -774,10 +774,6 @@ connect_proxy (GtkAction     *action,
 	}
       else 
 	{
-	  GtkWidget *image;
-
-	  image = gtk_button_get_image (GTK_BUTTON (proxy));
-
 	  if (GTK_BIN (proxy)->child == NULL || 
 	      GTK_IS_LABEL (GTK_BIN (proxy)->child))
 	    {
@@ -1527,8 +1523,6 @@ gtk_action_set_icon_name (GtkAction   *action,
       else if (GTK_IS_BUTTON (proxy) &&
 	       !gtk_button_get_use_stock (GTK_BUTTON (proxy)))
 	{
-	  GtkWidget *image;
-
 	  image = gtk_button_get_image (GTK_BUTTON (proxy));
 	  
 	  if (GTK_IS_IMAGE (image) &&
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 9451107a0d..bb9d03b10d 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1780,14 +1780,12 @@ gtk_assistant_set_page_title (GtkAssistant *assistant,
 			      GtkWidget    *page,
 			      const gchar  *title)
 {
-  GtkAssistantPrivate *priv;
   GtkAssistantPage *page_info;
   GList *child;
 
   g_return_if_fail (GTK_IS_ASSISTANT (assistant));
   g_return_if_fail (GTK_IS_WIDGET (page));
 
-  priv = assistant->priv;
   child = find_page (assistant, page);
 
   g_return_if_fail (child != NULL);
@@ -1814,14 +1812,12 @@ G_CONST_RETURN gchar*
 gtk_assistant_get_page_title (GtkAssistant *assistant,
 			      GtkWidget    *page)
 {
-  GtkAssistantPrivate *priv;
   GtkAssistantPage *page_info;
   GList *child;
 
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
 
-  priv = assistant->priv;
   child = find_page (assistant, page);
 
   g_return_val_if_fail (child != NULL, NULL);
@@ -1889,14 +1885,12 @@ GtkAssistantPageType
 gtk_assistant_get_page_type (GtkAssistant *assistant,
 			     GtkWidget    *page)
 {
-  GtkAssistantPrivate *priv;
   GtkAssistantPage *page_info;
   GList *child;
 
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), GTK_ASSISTANT_PAGE_CONTENT);
   g_return_val_if_fail (GTK_IS_WIDGET (page), GTK_ASSISTANT_PAGE_CONTENT);
 
-  priv = assistant->priv;
   child = find_page (assistant, page);
 
   g_return_val_if_fail (child != NULL, GTK_ASSISTANT_PAGE_CONTENT);
@@ -1971,14 +1965,12 @@ GdkPixbuf*
 gtk_assistant_get_page_header_image (GtkAssistant *assistant,
 				     GtkWidget    *page)
 {
-  GtkAssistantPrivate *priv;
   GtkAssistantPage *page_info;
   GList *child;
 
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
 
-  priv = assistant->priv;
   child = find_page (assistant, page);
 
   g_return_val_if_fail (child != NULL, NULL);
@@ -2053,14 +2045,12 @@ GdkPixbuf*
 gtk_assistant_get_page_side_image (GtkAssistant *assistant,
 				   GtkWidget    *page)
 {
-  GtkAssistantPrivate *priv;
   GtkAssistantPage *page_info;
   GList *child;
 
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
 
-  priv = assistant->priv;
   child = find_page (assistant, page);
 
   g_return_val_if_fail (child != NULL, NULL);
@@ -2128,14 +2118,12 @@ gboolean
 gtk_assistant_get_page_complete (GtkAssistant *assistant,
 				 GtkWidget    *page)
 {
-  GtkAssistantPrivate *priv;
   GtkAssistantPage *page_info;
   GList *child;
 
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), FALSE);
   g_return_val_if_fail (GTK_IS_WIDGET (page), FALSE);
 
-  priv = assistant->priv;
   child = find_page (assistant, page);
 
   g_return_val_if_fail (child != NULL, FALSE);
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 9b7d78b195..4c51a47d68 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1910,7 +1910,7 @@ gtk_button_screen_changed (GtkWidget *widget,
 
   show_image_connection =
     g_signal_connect (settings, "notify::gtk-button-images",
-		      G_CALLBACK (gtk_button_setting_changed), 0);
+		      G_CALLBACK (gtk_button_setting_changed), NULL);
   g_object_set_data (G_OBJECT (settings), 
 		     I_("gtk-button-connection"),
 		     GUINT_TO_POINTER (show_image_connection));
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 3effc22b92..eb97c1f8e0 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -55,7 +55,6 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkalias.h"
 
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index c2e3e23379..31b70c3e7e 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -357,10 +357,8 @@ gtk_cell_renderer_accel_set_property  (GObject      *object,
 
   if (changed)
     {
-      GtkCellRendererText *celltext;
       gchar *text;
 
-      celltext = GTK_CELL_RENDERER_TEXT (accel);
       text = convert_keysym_state_to_string (accel, accel->accel_key, accel->accel_mods, accel->keycode);
       g_object_set (accel, "text", text, NULL);
       g_free (text);
@@ -519,7 +517,7 @@ typedef GtkEventBoxClass GtkCellEditableEventBoxClass;
 
 G_DEFINE_TYPE_WITH_CODE (GtkCellEditableEventBox, _gtk_cell_editable_event_box, GTK_TYPE_EVENT_BOX, { \
     G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_EDITABLE, _gtk_cell_editable_event_box_cell_editable_init)   \
-      });
+      })
 
 
 static void
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 1723c87780..76fea367c3 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -439,7 +439,7 @@ gtk_cell_renderer_pixbuf_create_named_icon_pixbuf (GtkCellRendererPixbuf *cellpi
 					  priv->stock_size,
 					  &width, &height))
     {
-      g_warning ("Invalid icon size %d\n", priv->stock_size);
+      g_warning ("Invalid icon size %u\n", priv->stock_size);
       width = height = 24;
     }
 
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 9b21d3258e..f9a2433f66 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -55,7 +55,6 @@
 #include "gtkmenuitem.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
-#include "gtkimage.h"
 #include "gtkstock.h"
 #include "gtkaccessible.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 6a78b7f875..5dd45e470c 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -50,7 +50,7 @@
 #include "gtkintl.h"
 #include "gtkalias.h"
 
-const gchar gtk_combo_string_key[] = "gtk-combo-string-value";
+static const gchar gtk_combo_string_key[] = "gtk-combo-string-value";
 
 #define COMBO_LIST_MAX_HEIGHT	(400)
 #define	EMPTY_LIST_HEIGHT	(15)
@@ -561,7 +561,7 @@ gtk_combo_popup_list (GtkCombo *combo)
     {
       gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), 
                                    GTK_WINDOW (combo->popwin));
-      gtk_window_set_transient_for (combo->popwin, GTK_WINDOW (toplevel));
+      gtk_window_set_transient_for (GTK_WINDOW (combo->popwin), GTK_WINDOW (toplevel));
     }
 
   gtk_widget_set_size_request (combo->popwin, width, height);
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0b14e41e62..efcfaa8294 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3671,7 +3671,6 @@ gtk_combo_box_list_key_press (GtkWidget   *widget,
   if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter ||
       event->keyval == GDK_space || event->keyval == GDK_KP_Space) 
   {
-    GtkTreeIter iter;
     GtkTreeModel *model = NULL;
     
     gtk_combo_box_popdown (combo_box);
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index d5c4a6c4d0..73604d305c 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -1618,7 +1618,6 @@ draw_row (GtkCList     *clist,
 {
   GtkWidget *widget;
   GtkCTree  *ctree;
-  GdkRectangle *rect;
   GdkRectangle *crect;
   GdkRectangle row_rectangle;
   GdkRectangle cell_rectangle; 
@@ -1680,7 +1679,6 @@ draw_row (GtkCList     *clist,
   /* draw the cell borders */
   if (area)
     {
-      rect = &intersect_rectangle;
       crect = &intersect_rectangle;
 
       if (gdk_rectangle_intersect (area, &cell_rectangle, crect))
@@ -1690,7 +1688,6 @@ draw_row (GtkCList     *clist,
     }
   else
     {
-      rect = &clip_rectangle;
       crect = &cell_rectangle;
 
       gdk_draw_rectangle (clist->clist_window,
@@ -2515,7 +2512,6 @@ real_tree_expand (GtkCTree     *ctree,
   GtkCTreeNode *work;
   GtkRequisition requisition;
   gboolean visible;
-  gint level;
 
   g_return_if_fail (GTK_IS_CTREE (ctree));
 
@@ -2527,7 +2523,6 @@ real_tree_expand (GtkCTree     *ctree,
   GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
 
   GTK_CTREE_ROW (node)->expanded = TRUE;
-  level = GTK_CTREE_ROW (node)->level;
 
   visible = gtk_ctree_is_viewable (ctree, node);
   /* get cell width if tree_column is auto resized */
@@ -3513,7 +3508,6 @@ ctree_is_hot_spot (GtkCTree     *ctree,
 {
   GtkCTreeRow *tree_row;
   GtkCList *clist;
-  GtkCellPixText *cell;
   gint xl;
   gint yu;
   
@@ -3528,8 +3522,6 @@ ctree_is_hot_spot (GtkCTree     *ctree,
 
   tree_row = GTK_CTREE_ROW (node);
 
-  cell = GTK_CELL_PIXTEXT (tree_row->row.cell[ctree->tree_column]);
-
   yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height - PM_SIZE) / 2 -
 	(clist->row_height - 1) % 2);
 
@@ -3852,9 +3844,6 @@ gtk_ctree_remove_node (GtkCTree     *ctree,
 
   if (node)
     {
-      gboolean visible;
-
-      visible = gtk_ctree_is_viewable (ctree, node);
       gtk_ctree_unlink (ctree, node, TRUE);
       gtk_ctree_post_recursive (ctree, node, GTK_CTREE_FUNC (tree_delete),
 				NULL);
@@ -4103,7 +4092,7 @@ gtk_ctree_node_nth (GtkCTree *ctree,
 {
   g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
 
-  if ((row < 0) || (row >= GTK_CLIST(ctree)->rows))
+  if ((row >= GTK_CLIST(ctree)->rows))
     return NULL;
  
   return GTK_CTREE_NODE (g_list_nth (GTK_CLIST (ctree)->row_list, row));
diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index 469519a35e..fd7a269e56 100644
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -794,7 +794,7 @@ gtk_curve_reset (GtkCurve *c)
 void
 gtk_curve_set_gamma (GtkCurve *c, gfloat gamma)
 {
-  gfloat x, one_over_gamma, height, one_over_width;
+  gfloat x, one_over_gamma, height;
   GtkCurveType old_type;
   gint i;
 
@@ -808,7 +808,6 @@ gtk_curve_set_gamma (GtkCurve *c, gfloat gamma)
     one_over_gamma = 1.0;
   else
     one_over_gamma = 1.0 / gamma;
-  one_over_width = 1.0 / (c->num_points - 1);
   height = c->height;
   for (i = 0; i < c->num_points; ++i)
     {
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 71376c6d54..eaa95ddc69 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3109,7 +3109,7 @@ gtk_drag_set_icon_pixmap (GdkDragContext    *context,
   gtk_widget_push_colormap (colormap);
 
   window = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DND);
+  gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
   gtk_window_set_screen (GTK_WINDOW (window), screen);
   set_can_change_screen (window, FALSE);
   gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
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/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 828106c678..fd0cdb4b5c 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -219,7 +219,7 @@ static void     gtk_file_chooser_button_drag_data_received (GtkWidget        *wi
 							    gint              x,
 							    gint              y,
 							    GtkSelectionData *data,
-							    guint             info,
+							    guint             type,
 							    guint             drag_time);
 static void     gtk_file_chooser_button_show_all           (GtkWidget        *widget);
 static void     gtk_file_chooser_button_hide_all           (GtkWidget        *widget);
@@ -1033,7 +1033,7 @@ gtk_file_chooser_button_drag_data_received (GtkWidget	     *widget,
 					    gint	      x,
 					    gint	      y,
 					    GtkSelectionData *data,
-					    guint	      info,
+					    guint	      type,
 					    guint	      drag_time)
 {
   GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
@@ -1045,13 +1045,13 @@ gtk_file_chooser_button_drag_data_received (GtkWidget	     *widget,
     (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received) (widget,
 										    context,
 										    x, y,
-										    data, info,
+										    data, type,
 										    drag_time);
 
   if (widget == NULL || context == NULL || data == NULL || data->length < 0)
     return;
 
-  switch (info)
+  switch (type)
     {
     case TEXT_URI_LIST:
       {
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 095a8b40d4..d834c63d18 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -26,7 +26,6 @@
 #include "gtkcelllayout.h"
 #include "gtkcellrendererpixbuf.h"
 #include "gtkcellrenderertext.h"
-#include "gtkcellrenderertext.h"
 #include "gtkcheckmenuitem.h"
 #include "gtkclipboard.h"
 #include "gtkcombobox.h"
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/gtkfilechoosersettings.c b/gtk/gtkfilechoosersettings.c
index dcd769220b..1644eccf97 100644
--- a/gtk/gtkfilechoosersettings.c
+++ b/gtk/gtkfilechoosersettings.c
@@ -346,7 +346,7 @@ parse_config (GtkFileChooserSettings *settings,
 	      const char *contents,
 	      GError **error)
 {
-  GMarkupParser parser = { 0, };
+  GMarkupParser parser = { NULL, };
   GMarkupParseContext *context;
   struct parse_state state;
   gboolean retval;
diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 23b24c01a1..2496c56f1a 100644
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -833,8 +833,8 @@ gtk_file_system_unix_get_info (GtkFileSystem                *file_system,
   handle = create_handle (file_system);
 
   filename = gtk_file_path_get_string (path);
-  g_return_val_if_fail (filename != NULL, FALSE);
-  g_return_val_if_fail (g_path_is_absolute (filename), FALSE);
+  g_return_val_if_fail (filename != NULL, NULL);
+  g_return_val_if_fail (g_path_is_absolute (filename), NULL);
 
   if (!stat_with_error (filename, &statbuf, &error))
     {
@@ -1042,8 +1042,8 @@ gtk_file_system_unix_create_folder (GtkFileSystem                     *file_syst
   system_unix = GTK_FILE_SYSTEM_UNIX (file_system);
 
   filename = gtk_file_path_get_string (path);
-  g_return_val_if_fail (filename != NULL, FALSE);
-  g_return_val_if_fail (g_path_is_absolute (filename), FALSE);
+  g_return_val_if_fail (filename != NULL, NULL);
+  g_return_val_if_fail (g_path_is_absolute (filename), NULL);
 
   handle = create_handle (file_system);
 
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index bb41e5da53..fc1bd49c80 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -540,7 +540,7 @@ gtk_handle_box_size_request (GtkWidget      *widget,
     }
 
   /* if our child is not visible, we still request its size, since we
-   * won't have any usefull hint for our size otherwise.
+   * won't have any useful hint for our size otherwise.
    */
   if (bin->child)
     gtk_widget_size_request (bin->child, &child_requisition);
diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 4e4e7b655f..a15d8d39c3 100644
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -433,7 +433,7 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
   if (type != 0)
     {
       GTK_NOTE (ICONTHEME,
-		g_print ("invalid pixel data type %d\n", type));
+		g_print ("invalid pixel data type %u\n", type));
       return NULL;
     }
 
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 4c04b93790..0cc2cb1132 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1020,7 +1020,7 @@ gtk_icon_size_register_alias (const gchar *alias,
   init_icon_sizes ();
 
   if (!icon_size_lookup_intern (NULL, target, NULL, NULL))
-    g_warning ("gtk_icon_size_register_alias: Icon size %d does not exist", target);
+    g_warning ("gtk_icon_size_register_alias: Icon size %u does not exist", target);
 
   ia = g_hash_table_lookup (icon_aliases, alias);
   if (ia)
@@ -1453,7 +1453,7 @@ render_icon_name_pixbuf (GtkIconSource    *icon_source,
 	}
       else
 	{
-	  g_warning ("Invalid icon size %d\n", size);
+	  g_warning ("Invalid icon size %u\n", size);
 	  width = height = 24;
 	}
     }
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 92270bc459..cb96772260 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -875,7 +875,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;
@@ -1855,7 +1855,7 @@ theme_dir_get_icon_suffix (IconThemeDir *dir,
     suffix = GPOINTER_TO_UINT (g_hash_table_lookup (dir->icons, icon_name));
 
   GTK_NOTE (ICONTHEME, 
-	    g_print ("get_icon_suffix%s %d\n", dir->cache ? " (cached)" : "", suffix));
+	    g_print ("get_icon_suffix%s %u\n", dir->cache ? " (cached)" : "", suffix));
 
   return suffix;
 }
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 2991ef5615..9e066cf938 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8539,7 +8539,6 @@ gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
 {
   GtkIconViewAccessiblePrivate *priv;
   GtkIconViewItemAccessibleInfo *info;
-  GtkIconViewAccessible *view;
   GtkIconView *icon_view;
   GtkIconViewItemAccessible *item;
   GList *items;
@@ -8547,7 +8546,6 @@ gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
 
   atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
   icon_view = GTK_ICON_VIEW (user_data);
-  view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
   priv = gtk_icon_view_accessible_get_priv (atk_obj);
 
   items = priv->items;
@@ -8923,7 +8921,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)
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 500b9ad35b..2adc9d9b33 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -616,7 +616,7 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget,
 
   show_image_connection =
     g_signal_connect (settings, "notify::gtk-menu-images",
-		      G_CALLBACK (gtk_image_menu_item_setting_changed), 0);
+		      G_CALLBACK (gtk_image_menu_item_setting_changed), NULL);
   g_object_set_data (G_OBJECT (settings), 
 		     I_("gtk-image-menu-item-connection"),
 		     GUINT_TO_POINTER (show_image_connection));
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index 00d3ed8ddf..c78a454a1d 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -481,8 +481,10 @@ gtk_input_dialog_set_axis (GtkWidget *w,
   else
     old_use = GDK_AXIS_IGNORE;
 
-  if (axis == old_axis)
+  if (axis == old_axis) {
+    g_free (new_axes);
     return;
+  }
 
   /* we must always have an x and a y axis */
   if ((axis == -1 && (use == GDK_AXIS_X || use == GDK_AXIS_Y)) ||
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index d548edd7a0..b44e756e99 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -3956,7 +3956,6 @@ gtk_menu_stop_scrolling (GtkMenu *menu)
 {
   GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (menu));
   gboolean touchscreen_mode;
-  gboolean was_scrolling;
 
   gtk_menu_remove_scroll_timeout (menu);
   
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index e2f634adea..9b33063280 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -333,7 +333,7 @@ setup_type (GtkMessageDialog *dialog,
       break;
 
     default:
-      g_warning ("Unknown GtkMessageType %d", type);
+      g_warning ("Unknown GtkMessageType %u", type);
       break;
     }
 
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 66c44d29d9..d5a9b8a592 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -179,9 +179,9 @@ struct _GtkNotebookPrivate
 
   guint32 timestamp;
 
-  gboolean during_reorder : 1;
-  gboolean during_detach  : 1;
-  gboolean has_scrolled   : 1;
+  guint during_reorder : 1;
+  guint during_detach  : 1;
+  guint has_scrolled   : 1;
 };
 
 static const GtkTargetEntry notebook_source_targets [] = {
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 2f953faec2..442ef7f606 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -250,7 +250,6 @@ remove_settings_signal (GtkPathBar *path_bar,
 static void
 gtk_path_bar_dispose (GObject *object)
 {
-  GList *list;
   GtkPathBar *path_bar = GTK_PATH_BAR (object);
 
   remove_settings_signal (path_bar, gtk_widget_get_screen (GTK_WIDGET (object)));
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 75f345bae7..7b1ed3fdd5 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -358,11 +358,9 @@ combo_box_set (GtkWidget   *combo,
 	       const gchar *value)
 {
   GtkTreeModel *model;
-  GtkListStore *store;
   struct ComboSet set_data;
   
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
-  store = GTK_LIST_STORE (model);
 
   set_data.combo = GTK_COMBO_BOX (combo);
   set_data.value = value;
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index b2f789124e..2311241752 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -33,7 +33,6 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkrange.h"
-#include "gtkintl.h"
 #include "gtkscrollbar.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"
diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index b4f70641dd..3c9783e1a2 100644
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -1567,7 +1567,7 @@ count_parity (GtkRBTree *tree,
     g_print ("parity incorrect for node\n");
 
   if (get_parity (node) != 1)
-    g_error ("Node has incorrect parity %d", get_parity (node));
+    g_error ("Node has incorrect parity %u", get_parity (node));
   
   return res;
 }
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 1a9f131480..fe8575e285 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -60,7 +60,6 @@
 #include "gtkseparatormenuitem.h"
 #include "gtksizegroup.h"
 #include "gtktable.h"
-#include "gtktreeview.h"
 #include "gtktreemodelsort.h"
 #include "gtktreemodelfilter.h"
 #include "gtktreeselection.h"
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 9ad1cb10b4..a72d60e04b 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -45,13 +45,6 @@
 #include "gtkobject.h"
 #include "gtktooltips.h"
 #include "gtktypebuiltins.h"
-
-#include "gtkrecentmanager.h"
-#include "gtkrecentfilter.h"
-#include "gtkrecentchooser.h"
-#include "gtkrecentchooserutils.h"
-#include "gtkrecentchooserprivate.h"
-#include "gtkrecentchoosermenu.h"
 #include "gtkalias.h"
 
 struct _GtkRecentChooserMenuPrivate
@@ -915,7 +908,6 @@ gtk_recent_chooser_menu_create_item (GtkRecentChooserMenu *menu,
   		    G_CALLBACK (item_activate_cb),
   		    menu);
 
-out:
   g_free (label);
 
   return item;
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index d130b399ad..6ef783a361 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -928,7 +928,7 @@ gtk_scrolled_window_screen_changed (GtkWidget *widget,
 
   window_placement_connection =
     g_signal_connect (settings, "notify::gtk-scrolled-window-placement",
-		      G_CALLBACK (gtk_scrolled_window_settings_changed), 0);
+		      G_CALLBACK (gtk_scrolled_window_settings_changed), NULL);
   g_object_set_data (G_OBJECT (settings), 
 		     I_("gtk-scrolled-window-connection"),
 		     GUINT_TO_POINTER (window_placement_connection));
@@ -1049,7 +1049,7 @@ gtk_scrolled_window_scroll_child (GtkScrolledWindow *scrolled_window,
     case GTK_SCROLL_END:
       break;
     default:
-      g_warning ("Invalid scroll type %d for GtkSpinButton::change-value", scroll);
+      g_warning ("Invalid scroll type %u for GtkSpinButton::change-value", scroll);
       return;
     }
 
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 5715b50f40..451e5d860e 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1620,7 +1620,6 @@ gtk_selection_data_get_uris (GtkSelectionData *selection_data)
       selection_data->type == text_uri_list_atom)
     {
       gchar **list;
-      gint i;
       gint count = gdk_text_property_to_utf8_list_for_display (selection_data->display,
       							       utf8_atom,
 						   	       selection_data->format, 
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index d6115dd75d..11a2e96c70 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -259,12 +259,10 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
 		    const gchar  *text)
 {
   GtkStatusbarMsg *msg;
-  GtkStatusbarClass *class;
 
   g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
   g_return_val_if_fail (text != NULL, 0);
 
-  class = GTK_STATUSBAR_GET_CLASS (statusbar);
   msg = g_slice_new (GtkStatusbarMsg);
   msg->text = g_strdup (text);
   msg->context_id = context_id;
@@ -299,10 +297,6 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
 
 	  if (msg->context_id == context_id)
 	    {
-	      GtkStatusbarClass *class;
-
-	      class = GTK_STATUSBAR_GET_CLASS (statusbar);
-
 	      statusbar->messages = g_slist_remove_link (statusbar->messages,
 							 list);
 	      g_free (msg->text);
@@ -352,9 +346,6 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
 	  if (msg->context_id == context_id &&
 	      msg->message_id == message_id)
 	    {
-	      GtkStatusbarClass *class;
-	      
-	      class = GTK_STATUSBAR_GET_CLASS (statusbar);
 	      statusbar->messages = g_slist_remove_link (statusbar->messages, list);
 	      g_free (msg->text);
               g_slice_free (GtkStatusbarMsg, msg);
@@ -408,13 +399,11 @@ static void
 gtk_statusbar_destroy (GtkObject *object)
 {
   GtkStatusbar *statusbar;
-  GtkStatusbarClass *class;
   GSList *list;
 
   g_return_if_fail (GTK_IS_STATUSBAR (object));
 
   statusbar = GTK_STATUSBAR (object);
-  class = GTK_STATUSBAR_GET_CLASS (statusbar);
 
   for (list = statusbar->messages; list; list = list->next)
     {
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 92d31b7722..297a1493bd 100755
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -1044,7 +1044,7 @@ gtk_status_icon_set_image (GtkStatusIcon *status_icon,
       g_object_notify (G_OBJECT (status_icon), "icon-name");
       break;
     default:
-      g_warning ("Image type %d not handled by GtkStatusIcon", storage_type);
+      g_warning ("Image type %u not handled by GtkStatusIcon", storage_type);
     }
 
   g_object_thaw_notify (G_OBJECT (status_icon));
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index e933fc0e61..0d79deb3cc 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -563,7 +563,6 @@ static void
 gtk_text_buffer_finalize (GObject *object)
 {
   GtkTextBuffer *buffer;
-  GtkTextBufferPrivate *priv;
 
   buffer = GTK_TEXT_BUFFER (object);
 
@@ -3237,9 +3236,6 @@ clipboard_rich_text_received (GtkClipboard *clipboard,
   GtkTextIter insert_point;
   gboolean retval = TRUE;
   GError *error = NULL;
-  GtkTextBufferPrivate *priv;
-
-  priv = GTK_TEXT_BUFFER_GET_PRIVATE (request_data->buffer);
 
   if (text != NULL && length > 0)
     {
@@ -3328,7 +3324,6 @@ clipboard_clipboard_buffer_received (GtkClipboard     *clipboard,
 {
   ClipboardRequest *request_data = data;
   GtkTextBuffer *src_buffer;
-  GtkTextBufferPrivate *priv;
 
   src_buffer = selection_data_get_buffer (selection_data, request_data); 
 
@@ -3352,8 +3347,6 @@ clipboard_clipboard_buffer_received (GtkClipboard     *clipboard,
     }
   else
     {
-      priv = GTK_TEXT_BUFFER_GET_PRIVATE (request_data->buffer);
-
       if (gtk_clipboard_wait_is_rich_text_available (clipboard,
                                                      request_data->buffer))
         {
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 4ba37f9cf5..8ac3fb35f5 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -300,24 +300,12 @@ iter_init_from_char_offset (GtkTextIter *iter,
 }
 
 static inline void
-invalidate_segment (GtkTextRealIter *iter)
-{
-  iter->segments_changed_stamp -= 1;
-}
-
-static inline void
 invalidate_char_index (GtkTextRealIter *iter)
 {
   iter->cached_char_index = -1;
 }
 
 static inline void
-invalidate_line_number (GtkTextRealIter *iter)
-{
-  iter->cached_line_number = -1;
-}
-
-static inline void
 adjust_char_index (GtkTextRealIter *iter, gint count)
 {
   if (iter->cached_char_index >= 0)
@@ -332,28 +320,6 @@ adjust_line_number (GtkTextRealIter *iter, gint count)
 }
 
 static inline void
-adjust_char_offsets (GtkTextRealIter *iter, gint count)
-{
-  if (iter->line_char_offset >= 0)
-    {
-      iter->line_char_offset += count;
-      g_assert (iter->segment_char_offset >= 0);
-      iter->segment_char_offset += count;
-    }
-}
-
-static inline void
-adjust_byte_offsets (GtkTextRealIter *iter, gint count)
-{
-  if (iter->line_byte_offset >= 0)
-    {
-      iter->line_byte_offset += count;
-      g_assert (iter->segment_byte_offset >= 0);
-      iter->segment_byte_offset += count;
-    }
-}
-
-static inline void
 ensure_char_offsets (GtkTextRealIter *iter)
 {
   if (iter->line_char_offset < 0)
@@ -3917,7 +3883,6 @@ gtk_text_iter_set_visible_line_index (GtkTextIter *iter,
                                       gint         byte_on_line)
 {
   GtkTextRealIter *real;
-  gint bytes_in_line = 0;
   gint offset = 0;
   GtkTextIter pos;
   GtkTextLineSegment *seg;
@@ -3926,8 +3891,6 @@ gtk_text_iter_set_visible_line_index (GtkTextIter *iter,
 
   gtk_text_iter_set_line_offset (iter, 0);
 
-  bytes_in_line = gtk_text_iter_get_bytes_in_line (iter);
-
   pos = *iter;
 
   real = gtk_text_iter_make_real (&pos);
diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c
index 63f3781998..71eaaf7a0a 100644
--- a/gtk/gtktextsegment.c
+++ b/gtk/gtktextsegment.c
@@ -298,6 +298,11 @@ char_segment_split_func (GtkTextLineSegment *seg, int index)
  *      This procedure merges adjacent character segments into
  *      a single character segment, if possible.
  *
+ * Arguments:
+ *      segPtr: Pointer to the first of two adjacent segments to
+ *              join.
+ *      line:   Line containing segments (not used).
+ *
  * Results:
  *      The return value is a pointer to the first segment in
  *      the (new) list of segments that used to start with segPtr.
@@ -310,11 +315,7 @@ char_segment_split_func (GtkTextLineSegment *seg, int index)
 
         /* ARGSUSED */
 static GtkTextLineSegment *
-char_segment_cleanup_func (segPtr, line)
-     GtkTextLineSegment *segPtr;           /* Pointer to first of two adjacent
-                                         * segments to join. */
-     GtkTextLine *line;                /* Line containing segments (not
-                                        * used). */
+char_segment_cleanup_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
 {
   GtkTextLineSegment *segPtr2, *newPtr;
 
@@ -352,6 +353,12 @@ char_segment_cleanup_func (segPtr, line)
  *
  *      This procedure is invoked to delete a character segment.
  *
+ * Arguments:
+ *      segPtr   : Segment to delete
+ *      line     : Line containing segment
+ *      treeGone : Non-zero means the entire tree is being
+ *                 deleted, so everything must get cleaned up.
+ *
  * Results:
  *      Always returns 0 to indicate that the segment was deleted.
  *
@@ -363,12 +370,7 @@ char_segment_cleanup_func (segPtr, line)
 
         /* ARGSUSED */
 static int
-char_segment_delete_func (segPtr, line, treeGone)
-     GtkTextLineSegment *segPtr;           /* Segment to delete. */
-     GtkTextLine *line;                /* Line containing segment. */
-     int treeGone;                      /* Non-zero means the entire tree is
-                                         * being deleted, so everything must
-                                         * get cleaned up. */
+char_segment_delete_func (GtkTextLineSegment *segPtr, GtkTextLine *line, int treeGone)
 {
   g_free ((char*) segPtr);
   return 0;
@@ -382,6 +384,10 @@ char_segment_delete_func (segPtr, line, treeGone)
  *      This procedure is invoked to perform consistency checks
  *      on character segments.
  *
+ * Arguments:
+ *      segPtr : Segment to check
+ *      line   : Line containing segment
+ *
  * Results:
  *      None.
  *
@@ -394,9 +400,7 @@ char_segment_delete_func (segPtr, line, treeGone)
 
         /* ARGSUSED */
 static void
-char_segment_check_func (segPtr, line)
-     GtkTextLineSegment *segPtr;           /* Segment to check. */
-     GtkTextLine *line;                /* Line containing segment. */
+char_segment_check_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
 {
   char_segment_self_check (segPtr);
 
@@ -436,6 +440,12 @@ _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
  *
  *      This procedure is invoked to delete toggle segments.
  *
+ * Arguments:
+ *      segPtr   : Segment to check
+ *      line     : Line containing segment
+ *      treeGone : Non-zero means the entire tree is being
+ *                 deleted so everything must get cleaned up
+ *
  * Results:
  *      Returns 1 to indicate that the segment may not be deleted,
  *      unless the entire B-tree is going away.
@@ -449,12 +459,7 @@ _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
  */
 
 static int
-toggle_segment_delete_func (segPtr, line, treeGone)
-     GtkTextLineSegment *segPtr;           /* Segment to check. */
-     GtkTextLine *line;                /* Line containing segment. */
-     int treeGone;                      /* Non-zero means the entire tree is
-                                         * being deleted, so everything must
-                                         * get cleaned up. */
+toggle_segment_delete_func (GtkTextLineSegment *segPtr, GtkTextLine *line, int treeGone)
 {
   if (treeGone)
     {
@@ -488,6 +493,10 @@ toggle_segment_delete_func (segPtr, line, treeGone)
  *      been modified in some way.  It's invoked after the
  *      modifications are complete.
  *
+ * Arguments:
+ *      segPtr : Segment to check
+ *      line   : Line that now contains segment
+ *
  * Results:
  *      The return value is the head segment in a new list
  *      that is to replace the tail of the line that used to
@@ -503,9 +512,7 @@ toggle_segment_delete_func (segPtr, line, treeGone)
  */
 
 static GtkTextLineSegment *
-toggle_segment_cleanup_func (segPtr, line)
-     GtkTextLineSegment *segPtr;   /* Segment to check. */
-     GtkTextLine *line;        /* Line that now contains segment. */
+toggle_segment_cleanup_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
 {
   GtkTextLineSegment *segPtr2, *prevPtr;
   int counts;
@@ -563,6 +570,10 @@ toggle_segment_cleanup_func (segPtr, line)
  *      This procedure is invoked when a toggle segment is about
  *      to move from one line to another.
  *
+ * Arguments:
+ *      segPtr : Segment to check
+ *      line   : Line that used to contain segment
+ *
  * Results:
  *      None.
  *
@@ -573,9 +584,7 @@ toggle_segment_cleanup_func (segPtr, line)
  */
 
 static void
-toggle_segment_line_change_func (segPtr, line)
-     GtkTextLineSegment *segPtr;   /* Segment to check. */
-     GtkTextLine *line;        /* Line that used to contain segment. */
+toggle_segment_line_change_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
 {
   if (segPtr->body.toggle.inNodeCounts)
     {
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 5df48d3be8..3746f5704a 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -52,7 +52,6 @@
 #include "gtktexttag.h"
 #include "gtktexttypes.h"
 #include "gtktexttagtable.h"
-#include "gtkmain.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c
index 470beaaa56..941b6b7963 100644
--- a/gtk/gtktoggleaction.c
+++ b/gtk/gtktoggleaction.c
@@ -228,7 +228,7 @@ gtk_toggle_action_activate (GtkAction *action)
 
   toggle_action->private_data->active = !toggle_action->private_data->active;
 
-  g_object_notify (action, "active");
+  g_object_notify (G_OBJECT (action), "active");
 
   gtk_toggle_action_toggled (toggle_action);
 }
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 1003cb920c..cd99501c90 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -76,12 +76,10 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
 {
   GObjectClass *gobject_class;
   GtkWidgetClass *widget_class;
-  GtkContainerClass *container_class;
   GtkButtonClass *button_class;
 
   gobject_class = G_OBJECT_CLASS (class);
   widget_class = (GtkWidgetClass*) class;
-  container_class = (GtkContainerClass*) class;
   button_class = (GtkButtonClass*) class;
 
   gobject_class->set_property = gtk_toggle_button_set_property;
@@ -243,12 +241,8 @@ void
 gtk_toggle_button_set_mode (GtkToggleButton *toggle_button,
 			    gboolean         draw_indicator)
 {
-  GtkWidget *widget;
-
   g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
 
-  widget = GTK_WIDGET (toggle_button);
-
   draw_indicator = draw_indicator ? TRUE : FALSE;
 
   if (toggle_button->draw_indicator != draw_indicator)
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 6606617611..0dd959d9a5 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -38,7 +38,6 @@
 #include "gtkseparatortoolitem.h"
 #include "gtkmenu.h"
 #include "gtkradiobutton.h"
-#include "gtktoolbar.h"
 #include "gtkbindings.h"
 #include <gdk/gdkkeysyms.h>
 #include "gtkmarshalers.h"
@@ -243,12 +242,6 @@ static ToolbarContent *toolbar_content_new_tool_item        (GtkToolbar
 							     GtkToolItem         *item,
 							     gboolean             is_placeholder,
 							     gint                 pos);
-static ToolbarContent *toolbar_content_new_compatibility    (GtkToolbar          *toolbar,
-							     GtkToolbarChildType  type,
-							     GtkWidget           *widget,
-							     GtkWidget           *icon,
-							     GtkWidget           *label,
-							     gint                 pos);
 static void            toolbar_content_remove               (ToolbarContent      *content,
 							     GtkToolbar          *toolbar);
 static void            toolbar_content_free                 (ToolbarContent      *content);
@@ -1454,7 +1447,6 @@ gtk_toolbar_size_allocate (GtkWidget     *widget,
   GtkRequisition arrow_requisition;
   gboolean overflowing;
   gboolean size_changed;
-  gdouble elapsed;
   GtkAllocation item_area;
   
   size_changed = FALSE;
@@ -1735,7 +1727,6 @@ gtk_toolbar_size_allocate (GtkWidget     *widget,
 	}
     }
 
-  elapsed = g_timer_elapsed (priv->timer, NULL);
   for (list = priv->content, i = 0; list != NULL; list = list->next, ++i)
     {
       ToolbarContent *content = list->data;
@@ -3740,7 +3731,6 @@ internal_insert_element (GtkToolbar          *toolbar,
 			 gboolean             use_stock)
 {
   GtkWidget *box;
-  ToolbarContent *content;
   char *free_me = NULL;
 
   GtkWidget *child_widget;
@@ -3850,9 +3840,6 @@ internal_insert_element (GtkToolbar          *toolbar,
 			    tooltip_text, tooltip_private_text);
     }
   
-  content = toolbar_content_new_compatibility (toolbar, type, child_widget,
-					       child_icon, child_label, position);
-  
   if (free_me)
     g_free (free_me);
   
@@ -3927,54 +3914,6 @@ toolbar_content_new_tool_item (GtkToolbar  *toolbar,
   return content;
 }
 
-static ToolbarContent *
-toolbar_content_new_compatibility (GtkToolbar          *toolbar,
-				   GtkToolbarChildType  type,
-				   GtkWidget		*widget,
-				   GtkWidget		*icon,
-				   GtkWidget		*label,
-				   gint			 pos)
-{
-  ToolbarContent *content;
-  GtkToolbarChild *child;
-  GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-  
-  content = g_new0 (ToolbarContent, 1);
-
-  child = &(content->u.compatibility.child);
-  
-  content->type = COMPATIBILITY;
-  child->type = type;
-  child->widget = widget;
-  child->icon = icon;
-  child->label = label;
-  
-  if (type != GTK_TOOLBAR_CHILD_SPACE)
-    {
-      gtk_widget_set_parent (child->widget, GTK_WIDGET (toolbar));
-    }
-  else
-    {
-      content->u.compatibility.space_visible = TRUE;
-      gtk_widget_queue_resize (GTK_WIDGET (toolbar));
-    }
- 
-  if (type == GTK_TOOLBAR_CHILD_BUTTON ||
-      type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON ||
-      type == GTK_TOOLBAR_CHILD_RADIOBUTTON)
-    {
-      set_child_packing_and_visibility (toolbar, child);
-    }
-
-  priv->content = g_list_insert (priv->content, content, pos);
-  toolbar->children = g_list_insert (toolbar->children, child, pos);
-  priv->need_rebuild = TRUE;
-  
-  toolbar->num_children++;
-  
-  return content;
-}
-
 static void
 toolbar_content_remove (ToolbarContent *content,
 			GtkToolbar     *toolbar)
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index f70d7e599c..c7b2f573cf 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -32,7 +32,6 @@
 #include "gtkvbox.h"
 #include "gtkintl.h"
 #include "gtktoolbar.h"
-#include "gtkiconfactory.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"
 
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index af17f5547a..d203082d7c 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -438,9 +438,9 @@ gtk_tooltips_draw_tips (GtkTooltips *tooltips)
   else
     y = y + widget->allocation.height + 4;
 
-  toplevel = gtk_widget_get_toplevel (widget);
+  toplevel = GTK_WINDOW (gtk_widget_get_toplevel (widget));
   if (toplevel && GTK_IS_WINDOW (toplevel))
-    gtk_window_set_transient_for (tooltips->tip_window, toplevel);
+    gtk_window_set_transient_for (GTK_WINDOW (tooltips->tip_window), toplevel);
   
   gtk_window_move (GTK_WINDOW (tooltips->tip_window), x, y);
   gtk_widget_show (tooltips->tip_window);
diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index 02040fa4cb..f9c4c3f633 100644
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -537,7 +537,7 @@ _gtk_tree_data_list_set_header (GList                  *header_list,
       header = g_slice_new0 (GtkTreeDataSortHeader);
       header->sort_column_id = sort_column_id;
       if (list)
-	g_list_append (list, header);
+	list = g_list_append (list, header);
       else
 	header_list = g_list_append (header_list, header);
     }
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 74d1e9c43c..53f0d57e5b 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -951,7 +951,7 @@ gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
 {
   FilterElt *elt, *parent;
   FilterLevel *level, *parent_level;
-  gint offset, i, length;
+  gint i, length;
 
   gboolean emit_child_toggled = FALSE;
 
@@ -962,7 +962,6 @@ gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
   parent_level = level->parent_level;
 
   length = level->array->len;
-  offset = elt->offset;
 
   /* we distinguish a couple of cases:
    *  - root level, length > 1: emit row-deleted and remove.
@@ -1604,8 +1603,8 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
   GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data);
   GtkTreePath *path;
   GtkTreeIter iter;
-  FilterElt *elt, *parent;
-  FilterLevel *level, *parent_level;
+  FilterElt *elt, *parent = NULL;
+  FilterLevel *level, *parent_level = NULL;
   gboolean emit_child_toggled = FALSE;
   gint offset;
   gint i;
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index ee3a8151dd..e1636f4d72 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5586,7 +5586,6 @@ validate_visible_area (GtkTreeView *tree_view)
   GtkRBNode *node = NULL;
   gboolean need_redraw = FALSE;
   gboolean size_changed = FALSE;
-  gboolean update_dy = FALSE;
   gint total_height;
   gint area_above = 0;
   gint area_below = 0;
@@ -5611,8 +5610,6 @@ validate_visible_area (GtkTreeView *tree_view)
       if (path && !_gtk_tree_view_find_node (tree_view, path, &tree, &node))
 	{
           /* we are going to scroll, and will update dy */
-	  update_dy = TRUE;
-
 	  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
 	  if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
 	      GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))
@@ -5655,8 +5652,6 @@ validate_visible_area (GtkTreeView *tree_view)
 	      else
 	        {
 		  /* row not visible */
-                  update_dy = TRUE;
-
 		  if (dy >= 0 && dy <= tree_view->priv->vadjustment->page_size)
 		    {
 		      /* row at the beginning -- fixed */
@@ -5905,7 +5900,6 @@ validate_visible_area (GtkTreeView *tree_view)
             }
 	}
       area_above -= ROW_HEIGHT (tree_view, new_height);
-      update_dy = TRUE;
     }
 
   /* if we scrolled to a path, we need to set the dy here,
diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index a9c02142e5..b0321e8b41 100644
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -223,9 +223,6 @@ gtk_vscale_get_layout_offsets (GtkScale *scale,
 
     default:
       g_return_if_reached ();
-      *x = 0;
-      *y = 0;
-      break;
     }
 
   *x += widget->allocation.x;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index a5fadf9b82..392ebf5185 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -48,7 +48,6 @@
 #include <gobject/gvaluecollector.h>
 #include <gobject/gobjectnotifyqueue.c>
 #include "gdk/gdkkeysyms.h"
-#include "gtkintl.h"
 #include "gtkaccessible.h"
 #include "gtktooltips.h"
 #include "gtkinvisible.h"
diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index c83572a0bb..90310524c1 100644
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #endif
 
-#if USE_LA_MODULES
+#ifdef USE_LA_MODULES
 #define SOEXT ".la"
 #else
 #define SOEXT ("." G_MODULE_SUFFIX)
diff --git a/gtk/theme-bits/decompose-bits.c b/gtk/theme-bits/decompose-bits.c
index b2d6182758..f04ee8abc7 100644
--- a/gtk/theme-bits/decompose-bits.c
+++ b/gtk/theme-bits/decompose-bits.c
@@ -115,7 +115,7 @@ typedef enum {
   PART_LAST
 } Part;
 
-const char *part_names[PART_LAST] = {
+static const char *part_names[PART_LAST] = {
   "black",
   "dark",
   "mid",
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index da3071ccb0..f19d03c9c3 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -61,7 +61,7 @@ static gchar *var_name = "-";
 #define ALIGN_VALUE(this, boundary) \
   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
 
-gboolean
+static gboolean
 is_cache_up_to_date (const gchar *path)
 {
   struct stat path_stat, cache_stat;
@@ -91,7 +91,7 @@ is_cache_up_to_date (const gchar *path)
   return cache_stat.st_mtime >= path_stat.st_mtime;
 }
 
-gboolean
+static gboolean
 has_theme_index (const gchar *path)
 {
   gboolean result;
@@ -450,7 +450,7 @@ maybe_cache_image_data (Image       *image,
     }
 }
 
-GList *
+static GList *
 scan_directory (const gchar *base_path, 
 		const gchar *subdir, 
 		GHashTable  *files, 
@@ -614,7 +614,7 @@ convert_to_hash (gpointer key, gpointer value, gpointer user_data)
   return TRUE;
 }
 
-gboolean
+static gboolean
 write_string (FILE *cache, const gchar *n)
 {
   gchar *s;
@@ -631,7 +631,7 @@ write_string (FILE *cache, const gchar *n)
   
 }
 
-gboolean
+static gboolean
 write_card16 (FILE *cache, guint16 n)
 {
   int i;
@@ -643,7 +643,7 @@ write_card16 (FILE *cache, guint16 n)
   return i == 1;
 }
 
-gboolean
+static gboolean
 write_card32 (FILE *cache, guint32 n)
 {
   int i;
@@ -656,7 +656,7 @@ write_card32 (FILE *cache, guint32 n)
 }
 
 
-gboolean
+static gboolean
 write_pixdata (FILE *cache, GdkPixdata *pixdata)
 {
   guint8 *s;
@@ -691,7 +691,7 @@ write_header (FILE *cache, guint32 dir_list_offset)
 	  write_card32 (cache, dir_list_offset));
 }
 
-guint
+static guint
 get_image_meta_data_size (Image *image)
 {
   gint i;
@@ -719,7 +719,7 @@ get_image_meta_data_size (Image *image)
   return len;
 }
 
-guint
+static guint
 get_image_pixel_data_size (Image *image)
 {
   if (image->pixel_data_size == 0)
@@ -735,7 +735,7 @@ get_image_pixel_data_size (Image *image)
   return image->pixel_data_size;
 }
 
-guint
+static guint
 get_image_data_size (Image *image)
 {
   guint len;
@@ -751,7 +751,7 @@ get_image_data_size (Image *image)
   return len;
 }
 
-guint
+static guint
 get_single_node_size (HashNode *node, gboolean include_image_data)
 {
   int len = 0;
@@ -778,7 +778,7 @@ get_single_node_size (HashNode *node, gboolean include_image_data)
   return len;
 }
 
-guint
+static guint
 get_bucket_size (HashNode *node)
 {
   int len = 0;
@@ -792,7 +792,7 @@ get_bucket_size (HashNode *node)
   return len;
 }
 
-gboolean
+static gboolean
 write_bucket (FILE *cache, HashNode *node, int *offset)
 {
   while (node != NULL)
@@ -1012,7 +1012,7 @@ write_bucket (FILE *cache, HashNode *node, int *offset)
   return TRUE;
 }
 
-gboolean
+static gboolean
 write_hash_table (FILE *cache, HashContext *context, int *new_offset)
 {
   int offset = HASH_OFFSET;
@@ -1060,7 +1060,7 @@ write_hash_table (FILE *cache, HashContext *context, int *new_offset)
   return TRUE;
 }
 
-gboolean
+static gboolean
 write_dir_index (FILE *cache, int offset, GList *directories)
 {
   int n_dirs;
@@ -1094,7 +1094,7 @@ write_dir_index (FILE *cache, int offset, GList *directories)
   return TRUE;
 }
 
-gboolean
+static gboolean
 write_file (FILE *cache, GHashTable *files, GList *directories)
 {
   HashContext context;
@@ -1140,7 +1140,7 @@ write_file (FILE *cache, GHashTable *files, GList *directories)
   return TRUE;
 }
 
-void
+static void
 build_cache (const gchar *path)
 {
   gchar *cache_path, *tmp_cache_path;
@@ -1243,7 +1243,7 @@ build_cache (const gchar *path)
     g_printerr (_("Cache file created successfully.\n"));
 }
 
-void
+static void
 write_csource (const gchar *path)
 {
   gchar *cache_path;
diff --git a/gtk/xdgmime/xdgmimealias.c b/gtk/xdgmime/xdgmimealias.c
index 2dd70f1d69..07d89eb32e 100644
--- a/gtk/xdgmime/xdgmimealias.c
+++ b/gtk/xdgmime/xdgmimealias.c
@@ -105,7 +105,7 @@ _xdg_mime_alias_list_lookup (XdgAliasList *list,
   if (list->n_aliases > 0)
     {
       key.alias = (char *)alias;
-      key.mime_type = 0;
+      key.mime_type = NULL;
 
       entry = bsearch (&key, list->aliases, list->n_aliases,
 		       sizeof (XdgAlias), alias_entry_cmp);