diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-20 22:55:22 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-20 23:01:18 +0800 |
| commit | 2cb90d9082371198bdb18831d1f18759b9ed5b09 (patch) | |
| tree | a0bca16f6ea100aac7cf3fdf594db114052bd67f | |
| parent | 4e1bf5a7cbd03f934a74ebdc1d1bc1da9fe0b429 (diff) | |
| download | gsoc2013-empathy-2cb90d9082371198bdb18831d1f18759b9ed5b09.tar gsoc2013-empathy-2cb90d9082371198bdb18831d1f18759b9ed5b09.tar.gz gsoc2013-empathy-2cb90d9082371198bdb18831d1f18759b9ed5b09.tar.bz2 gsoc2013-empathy-2cb90d9082371198bdb18831d1f18759b9ed5b09.tar.lz gsoc2013-empathy-2cb90d9082371198bdb18831d1f18759b9ed5b09.tar.xz gsoc2013-empathy-2cb90d9082371198bdb18831d1f18759b9ed5b09.tar.zst gsoc2013-empathy-2cb90d9082371198bdb18831d1f18759b9ed5b09.zip | |
src/empathy-main-window.c: fix shadow declarations and uint comparaisons
| -rw-r--r-- | src/empathy-main-window.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 8b1c412d0..83daac08d 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -113,7 +113,7 @@ typedef struct { GList *actions_connected; } EmpathyMainWindow; -static EmpathyMainWindow *window = NULL; +static EmpathyMainWindow *main_window = NULL; static void main_window_flash_stop (EmpathyMainWindow *window) @@ -1147,7 +1147,7 @@ main_window_connection_items_setup (EmpathyMainWindow *window, { GList *list; GObject *action; - gint i; + guint i; 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) { - return window != NULL ? window->window : NULL; + return main_window != NULL ? main_window->window : NULL; } GtkWidget * empathy_main_window_show (void) { + EmpathyMainWindow *window; EmpathyContactList *list_iface; EmpathyContactMonitor *monitor; GtkBuilder *gui; @@ -1186,12 +1187,13 @@ empathy_main_window_show (void) 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"); |