[empathy] src/empathy-debug-window: fix shadow declarations and uint comparaisons

[Guillaume Desmottes <gdesmott src gnome org>]

commit be4654da13c2c957c72637678ad3a9f07a4b4e9d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Oct 20 15:52:22 2009 +0100

    src/empathy-debug-window: fix shadow declarations and uint comparaisons

 src/empathy-debug-window.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 373da33..b0bce62 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -329,7 +329,7 @@ debug_window_get_messages_cb (TpProxy *proxy,
   GtkTreeIter iter;
   gchar *name;
   GList *old_messages;
-  gint i;
+  guint i;
 
   if (error != NULL)
     {
@@ -648,11 +648,11 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy,
        * just joined), we don't need to check whether the unique
        * name is in the CM model. Hooray.
        */
-      GtkTreeIter iter;
       const gchar *name = arg0 + strlen (CM_WELL_KNOWN_NAME_PREFIX);
 
       if (!g_hash_table_lookup (priv->all_cms, name))
         {
+          GtkTreeIter iter;
           DEBUG ("Adding new CM '%s' at %s.", name, arg2);
 
           gtk_list_store_append (priv->cms, &iter);