aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-08-02 18:57:42 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-08-02 18:57:42 +0800
commit6796f373b5b2a157351a2e36c06732ba4332a463 (patch)
treec2deeca2533fb69b97be1c40f1d411f876061fe2
parent91fde5430b09201a0e0c0bb6b484c5291392f51e (diff)
downloadgsoc2013-empathy-6796f373b5b2a157351a2e36c06732ba4332a463.tar
gsoc2013-empathy-6796f373b5b2a157351a2e36c06732ba4332a463.tar.gz
gsoc2013-empathy-6796f373b5b2a157351a2e36c06732ba4332a463.tar.bz2
gsoc2013-empathy-6796f373b5b2a157351a2e36c06732ba4332a463.tar.lz
gsoc2013-empathy-6796f373b5b2a157351a2e36c06732ba4332a463.tar.xz
gsoc2013-empathy-6796f373b5b2a157351a2e36c06732ba4332a463.tar.zst
gsoc2013-empathy-6796f373b5b2a157351a2e36c06732ba4332a463.zip
Click on the tray icon shows the window if it's not active and hide if it
2007-08-02 Xavier Claessens <xclaesse@gmail.com> * libempathy-gtk/empathy-status-icon.c: Click on the tray icon shows the window if it's not active and hide if it is. Fixes bug #462057 (Olivier Valentin). svn path=/trunk/; revision=223
-rw-r--r--ChangeLog6
-rw-r--r--libempathy-gtk/empathy-status-icon.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 72efb1364..9497443c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-08-02 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy-gtk/empathy-status-icon.c: Click on the tray icon shows the
+ window if it's not active and hide if it is. Fixes bug #462057
+ (Olivier Valentin).
+
+2007-08-02 Xavier Claessens <xclaesse@gmail.com>
+
* libempathy-gtk/empathy-group-chat.c: don't display
"Topic set to: (null)". Fixes bug #460205 (Michael Scherer).
diff --git a/libempathy-gtk/empathy-status-icon.c b/libempathy-gtk/empathy-status-icon.c
index 6cd0f5f90..654cbd50d 100644
--- a/libempathy-gtk/empathy-status-icon.c
+++ b/libempathy-gtk/empathy-status-icon.c
@@ -387,7 +387,7 @@ status_icon_toggle_visibility (EmpathyStatusIcon *icon)
priv = GET_PRIV (icon);
- visible = empathy_window_get_is_visible (GTK_WINDOW (priv->window));
+ visible = gtk_window_has_toplevel_focus (GTK_WINDOW (priv->window));
if (visible) {
empathy_window_iconify (priv->window, priv->icon);