src/empathy-main-window.c: fix shadow declarations and uint comparaisons

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 8b1c412d0e012d211beda857300ff16df2abd34f..83daac08de69d6952e947d2612c15c6783bb0b53 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -113,7 +113,7 @@ typedef struct {
        GList                  *actions_connected;
 } EmpathyMainWindow;
 
        GList                  *actions_connected;
 } EmpathyMainWindow;
 

-static EmpathyMainWindow *window = NULL;
+static EmpathyMainWindow *main_window = NULL;

 
 static void
 main_window_flash_stop (EmpathyMainWindow *window)
 
 static void
 main_window_flash_stop (EmpathyMainWindow *window)


@@ -1147,7 +1147,7 @@ main_window_connection_items_setup (EmpathyMainWindow *window,
 {
        GList         *list;
        GObject       *action;
 {
        GList         *list;
        GObject       *action;

-       gint           i;
+       guint          i;

        const gchar *actions_connected[] = {
                "room",
                "chat_new_message",
        const gchar *actions_connected[] = {
                "room",
                "chat_new_message",


@@ -1166,12 +1166,13 @@ main_window_connection_items_setup (EmpathyMainWindow *window,
 GtkWidget *
 empathy_main_window_get (void)
 {
 GtkWidget *
 empathy_main_window_get (void)
 {

-  return window != NULL ? window->window : NULL;
+  return main_window != NULL ? main_window->window : NULL;

 }
 
 GtkWidget *
 empathy_main_window_show (void)
 {
 }
 
 GtkWidget *
 empathy_main_window_show (void)
 {

+       EmpathyMainWindow        *window;

        EmpathyContactList       *list_iface;
        EmpathyContactMonitor    *monitor;
        GtkBuilder               *gui;
        EmpathyContactList       *list_iface;
        EmpathyContactMonitor    *monitor;
        GtkBuilder               *gui;


@@ -1186,12 +1187,13 @@ empathy_main_window_show (void)
        gchar                    *filename;
        GSList                   *l;
 
        gchar                    *filename;
        GSList                   *l;
 

-       if (window) {
-               empathy_window_present (GTK_WINDOW (window->window), TRUE);
-               return window->window;
+       if (main_window) {
+               empathy_window_present (GTK_WINDOW (main_window->window), TRUE);
+               return main_window->window;

        }
 
        }
 

-       window = g_new0 (EmpathyMainWindow, 1);
+       main_window = g_new0 (EmpathyMainWindow, 1);
+       window = main_window;

 
        /* Set up interface */
        filename = empathy_file_lookup ("empathy-main-window.ui", "src");
 
        /* Set up interface */
        filename = empathy_file_lookup ("empathy-main-window.ui", "src");