Fix crash when iconifying main window if it's already hiden.

2007-10-19  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-status-icon.c: Fix crash when iconifying main
	window if it's already hiden.

svn path=/trunk/; revision=379

diff --git a/ChangeLog b/ChangeLog
index 0423e6ecb55826688e1eb7227c5ba3a984c36d9d..9fa143c7f4cf1518c008d68e899372dd43846493 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/empathy-status-icon.c: Fix crash when iconifying main
+       window if it's already hiden.
+
 2007-10-19  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-group-chat.c:

diff --git a/libempathy-gtk/empathy-status-icon.c b/libempathy-gtk/empathy-status-icon.c
index 16a678dcd60a2bba125be55eeb2168d1038bb7c4..204ff383b368e6e76e2546243a271b5ab791fdc2 100644 (file)
--- a/libempathy-gtk/empathy-status-icon.c
+++ b/libempathy-gtk/empathy-status-icon.c
@@ -248,7 +248,9 @@ empathy_status_icon_new (GtkWindow *window)
                              EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
                              &should_hide);
 
-       status_icon_set_visibility (icon, !should_hide);
+       if (gtk_window_is_active (priv->window) == should_hide) {
+               status_icon_set_visibility (icon, !should_hide);
+       }
 
        return icon;
 }