From a753213fd2a4cca960ae3917c0b582df0d005b3d Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 19 Oct 2007 11:04:06 +0000 Subject: Fix crash when iconifying main window if it's already hiden. 2007-10-19 Xavier Claessens * libempathy-gtk/empathy-status-icon.c: Fix crash when iconifying main window if it's already hiden. svn path=/trunk/; revision=379 --- ChangeLog | 5 +++++ libempathy-gtk/empathy-status-icon.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0423e6ecb..9fa143c7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-19 Xavier Claessens + + * libempathy-gtk/empathy-status-icon.c: Fix crash when iconifying main + window if it's already hiden. + 2007-10-19 Xavier Claessens * libempathy-gtk/empathy-group-chat.c: 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; } -- cgit v1.2.3