Do not restore away presence message when coming back after the user set

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.

svn path=/trunk/; revision=101

diff --git a/ChangeLog b/ChangeLog
index ff1c7e1246244c59015c260c750d3309a13fffa7..df6ac50370c9be096c563a7176d1c39b3f5edd59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 42719a47eb0d27fbb2b50c3ce6f9d3efa814fc14..6b9cfb3b9d02900e8a51575bebe0db6d0b8ac6da 100644 (file)
--- 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,