[Pkg-telepathy-commits] ./packages/unstable/empathy r80: * debian/patches/fix_setting_avatar.patch

[Sjoerd Simons]

------------------------------------------------------------
revno: 80
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: empathy
timestamp: Sat 2008-01-05 20:06:28 +0100
message:
  * debian/patches/fix_setting_avatar.patch
  * debian/patches/listen_to_presence_changed.patch
    - Added. Listen to the PresenceChanged signal from the MC instead of the
      deprecated PresenceStatusActual.
added:
  patches/listen_to_presence_changed.patch
modified:
  changelog
-------------- next part --------------
=== added file 'patches/listen_to_presence_changed.patch'
--- a/patches/listen_to_presence_changed.patch	1970-01-01 00:00:00 +0000
+++ b/patches/listen_to_presence_changed.patch	2008-01-05 19:06:28 +0000
@@ -0,0 +1,60 @@
+From: Xavier Claessens <xclaesse at gmail.com>
+Date: Wed, 2 Jan 2008 22:42:24 +0000 (+0100)
+Subject: Do not use deprecated PresenceStatusActual MC signal, use instead PresenceChanged.
+X-Git-Url: http://git.collabora.co.uk/?p=user%2Fxclaesse%2Fempathy.git;a=commitdiff_plain;h=1a084551cc58a3ed5db8af5d09fdaadf8e385a50;hp=17c0363b047ad8b7cbfb508f41fefead7b8a26bc
+
+Do not use deprecated PresenceStatusActual MC signal, use instead PresenceChanged.
+---
+
+diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
+index 0239d14..b178257 100644
+--- a/libempathy/empathy-idle.c
++++ b/libempathy/empathy-idle.c
+@@ -81,6 +81,7 @@ static void     idle_set_property            (GObject          *object,
+ 					      GParamSpec       *pspec);
+ static void     idle_presence_changed_cb     (MissionControl   *mc,
+ 					      McPresence        state,
++					      gchar            *status,
+ 					      EmpathyIdle      *idle);
+ static void     idle_session_idle_changed_cb (DBusGProxy       *gs_proxy,
+ 					      gboolean          is_idle,
+@@ -167,10 +168,10 @@ empathy_idle_init (EmpathyIdle *idle)
+ 	priv->is_idle = FALSE;
+ 	priv->mc = empathy_mission_control_new ();
+ 	priv->state = mission_control_get_presence_actual (priv->mc, NULL);
+-	idle_presence_changed_cb (priv->mc, priv->state, idle);
++	priv->status = mission_control_get_presence_message_actual (priv->mc, NULL);
+ 
+ 	dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
+-				     "PresenceStatusActual",
++				     "PresenceChanged",
+ 				     G_CALLBACK (idle_presence_changed_cb),
+ 				     idle, NULL);
+ 
+@@ -487,19 +488,21 @@ empathy_idle_set_use_nm (EmpathyIdle *idle,
+ static void
+ idle_presence_changed_cb (MissionControl *mc,
+ 			  McPresence      state,
++			  gchar          *status,
+ 			  EmpathyIdle    *idle)
+ {
+ 	EmpathyIdlePriv *priv;
+ 
+ 	priv = GET_PRIV (idle);
+ 
++	empathy_debug (DEBUG_DOMAIN, "Presence changed to '%s' (%d)",
++		       status, state);
++
+ 	g_free (priv->status);
+ 	priv->state = state;
+-	priv->status = mission_control_get_presence_message_actual (priv->mc, NULL);
+-
+-	if (G_STR_EMPTY (priv->status)) {
+-		g_free (priv->status);
+-		priv->status = NULL;
++	priv->status = NULL;
++	if (!G_STR_EMPTY (status)) {
++		priv->status = g_strdup (status);
+ 	}
+ 
+ 	g_object_notify (G_OBJECT (idle), "state");

=== modified file 'changelog'
--- a/changelog	2008-01-05 18:06:10 +0000
+++ b/changelog	2008-01-05 19:06:28 +0000
@@ -5,8 +5,11 @@
   * Bump Standards-Version to 3.7.3, no further changes.
 
   [ Sjoerd Simons ]
-  * patches/fix_setting_avatar.patch
+  * debian/patches/fix_setting_avatar.patch
     - Added. Fix setting avatars
+  * debian/patches/listen_to_presence_changed.patch
+    - Added. Listen to the PresenceChanged signal from the MC instead of the
+      deprecated PresenceStatusActual.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 05 Jan 2008 19:06:01 +0100