diff --git a/ChangeLog b/ChangeLog
index 2381aba..2d5535a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-08  Lucas Rocha  <lucasr@cvs.gnome.org>
+
+	* src/about.c, src/calendar.c, src/fileselection.c,
+	src/option.c, src/progress.c, src/text.c, src/tree.c,
+	src/util.c: general code cleanups. Contribution from 
+	Benoît Dejean.
+
 2005-07-08  Lucas Rocha  <lucasr@cvs.gnome.org>
 
 	* src/about.c, src/option.c, src/fileselection.c:
diff --git a/src/about.c b/src/about.c
index 1b9d921..6522e3c 100644
--- a/src/about.c
+++ b/src/about.c
@@ -255,7 +255,7 @@ zenity_create_clothes (GtkWidget *canvas_board)
   GdkPixbuf *pixbuf;
   GnomeCanvasItem *canvas_item;
   gchar *pixbuf_path;
-  gint i;
+  size_t i;
 
   for (i = 0; i < G_N_ELEMENTS (monk_clothes); i++) {
     pixbuf_path = g_strconcat (ZENITY_CLOTHES_PATH, monk_clothes[i].filename, NULL); 
@@ -557,7 +557,6 @@ static void
 zenity_about_dialog_response (GtkWidget *widget, int response, gpointer data)
 {
   ZenityData *zen_data = data;
-  GError *error = NULL;
 
   switch (response) {
     case GTK_RESPONSE_OK:
diff --git a/src/calendar.c b/src/calendar.c
index 7e9eb9c..f876c03 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -89,7 +89,7 @@ static void
 zenity_calendar_dialog_response (GtkWidget *widget, int response, gpointer data)
 {
   ZenityData *zen_data;
-  gint day, month, year;
+  guint day, month, year;
   gchar time_string[128];
   GDate *date = NULL;
 
diff --git a/src/fileselection.c b/src/fileselection.c
index 91c0a0f..5385922 100644
--- a/src/fileselection.c
+++ b/src/fileselection.c
@@ -91,7 +91,6 @@ zenity_fileselection_dialog_response (GtkWidget *widget, int response, gpointer
 {
   ZenityFileData *file_data = data;
   GSList *selections, *iter;
-  int i;
 	  
   switch (response) {
     case GTK_RESPONSE_OK:
diff --git a/src/option.c b/src/option.c
index 1d47be8..362751f 100644
--- a/src/option.c
+++ b/src/option.c
@@ -947,8 +947,6 @@ zenity_calendar_post_callback (GOptionContext *context,
 		               gpointer	       data,
 		               GError        **error)
 {
-  int i;
-
   zenity_option_set_dialog_mode (zenity_calendar_active, MODE_CALENDAR);
 
   if (results->mode == MODE_CALENDAR) {
diff --git a/src/progress.c b/src/progress.c
index d92d2e2..34779c1 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -33,7 +33,6 @@
 #include "zenity.h"
 #include "util.h"
 
-static guint timer;
 static GladeXML *glade_dialog;
 static ZenityData *zen_data;
 static GIOChannel *channel;
diff --git a/src/text.c b/src/text.c
index 151e000..f3b331d 100644
--- a/src/text.c
+++ b/src/text.c
@@ -39,9 +39,6 @@ zenity_text_handle_stdin (GIOChannel  *channel,
   static GtkTextBuffer *buffer;
   gchar buf[1024];
 
-  static GtkTextIter iter, end;
-  static gboolean first_time = FALSE;
-  gchar *str;
   gsize len;
 
   buffer = GTK_TEXT_BUFFER (data);
diff --git a/src/tree.c b/src/tree.c
index 72a9b39..d6621c3 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -529,7 +529,7 @@ static gboolean
 zenity_tree_dialog_toggle_get_selected (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, GtkTreeView *tree_view)
 {
   GValue toggle_value = {0, };
-  gint n_columns, print_column, i;
+  gint n_columns, i;
 
   n_columns = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
 
diff --git a/src/util.c b/src/util.c
index f503526..4fc7f8d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -320,7 +320,7 @@ transient_get_xterm_toplevel (void)
   while (xterm != None && !transient_is_toplevel (xterm))
   {
     Window root, parent, *children;
-    int nchildren;
+    unsigned nchildren;
     XQueryTree (dpy, xterm,
                 &root, &parent,
                 &children, &nchildren);