aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libempathy-gtk/empathy-status-icon.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0423e6ecb..9fa143c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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:
* libempathy/empathy-tp-chatroom.c:Don't accept invitation if we are
not invited.
diff --git a/libempathy-gtk/empathy-status-icon.c b/libempathy-gtk/empathy-status-icon.c
index 16a678dcd..204ff383b 100644
--- 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;
}