diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libempathy/empathy-idle.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2007-05-31 Xavier Claessens <xclaesse@gmail.com> + * libempathy/empathy-idle.c: Do not restore away presence message when + coming back after the user set manually to away. + +2007-05-31 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/gossip-account-chooser.c: Fix warning when selecting all accounts. diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index 42719a47e..6b9cfb3b9 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -154,6 +154,7 @@ idle_session_idle_changed_cb (DBusGProxy *gs_proxy, /* We are now idle, set state to away */ priv->saved_state = mission_control_get_presence_actual (priv->mc, NULL); + priv->saved_status = mission_control_get_presence_message_actual (priv->mc, NULL); if (priv->saved_state <= MC_PRESENCE_OFFLINE || priv->saved_state == MC_PRESENCE_HIDDEN) { @@ -168,8 +169,6 @@ idle_session_idle_changed_cb (DBusGProxy *gs_proxy, priv->saved_status = NULL; } - priv->saved_status = mission_control_get_presence_message_actual (priv->mc, NULL); - gossip_debug (DEBUG_DOMAIN, "Going to autoaway"); mission_control_set_presence (priv->mc, new_state, |