[Pkg-telepathy-commits] ./packages/unstable/telepathy-mission-control r62: * debian/patches/add_signals_to_proxy.patch

[Sjoerd Simons]

------------------------------------------------------------
revno: 62
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-mission-control
timestamp: Sat 2008-01-05 19:58:05 +0100
message:
  * debian/patches/add_signals_to_proxy.patch
    - Added. Add some missing signals to the MC proxy object
  * patches/emit_presence_changed_on_status_changed.patch
    - Added. Also emit PresenceChanged if the status message changed
added:
  patches/add_signals_to_proxy.patch
  patches/emit_presence_changed_on_status_changed.patch
modified:
  changelog
-------------- next part --------------
=== added file 'patches/add_signals_to_proxy.patch'
--- a/patches/add_signals_to_proxy.patch	1970-01-01 00:00:00 +0000
+++ b/patches/add_signals_to_proxy.patch	2008-01-05 18:58:05 +0000
@@ -0,0 +1,17 @@
+Index: libmissioncontrol/mission-control.c
+===================================================================
+--- libmissioncontrol/mission-control.c	(revision 219)
++++ libmissioncontrol/mission-control.c	(working copy)
+@@ -358,6 +358,12 @@
+ 			     G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID);
+     dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "StatusActual",
+ 			     G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID);
++    dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "AccountPresenceChanged",
++           G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
++           G_TYPE_UINT, G_TYPE_STRING,G_TYPE_INVALID);
++    dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "PresenceChanged",
++          G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
++
+     return mc_obj;
+ }
+ 

=== added file 'patches/emit_presence_changed_on_status_changed.patch'
--- a/patches/emit_presence_changed_on_status_changed.patch	1970-01-01 00:00:00 +0000
+++ b/patches/emit_presence_changed_on_status_changed.patch	2008-01-05 18:58:05 +0000
@@ -0,0 +1,47 @@
+Index: src/mcd-presence-frame.c
+===================================================================
+--- src/mcd-presence-frame.c	(revision 219)
++++ src/mcd-presence-frame.c	(working copy)
+@@ -484,9 +484,9 @@
+ {
+     McdPresenceFramePrivate *priv;
+     McdActualPresenceInfo pi;
+-    McPresence old_presence;
+     TelepathyConnectionStatus connection_status;
+     TelepathyConnectionStatusReason connection_reason;
++    gboolean changed;
+     
+     g_debug ("%s called", G_STRFUNC);
+ 
+@@ -501,7 +501,9 @@
+     connection_status = priv->actual_presence->connection_status;
+     connection_reason = priv->actual_presence->connection_reason;
+ 
+-    old_presence = priv->actual_presence->presence;
++    changed = (priv->actual_presence->presence != pi.presence) ||
++              (tp_strdiff (priv->actual_presence->message, presence_message));
++
+     mcd_presence_free (priv->actual_presence);
+     priv->actual_presence = mcd_presence_new (pi.presence,
+ 					      presence_message,
+@@ -509,8 +511,8 @@
+ 					      connection_reason);
+ 
+     g_debug ("%s: presence actual: %d", G_STRFUNC, pi.presence);
+-    if (old_presence != pi.presence)
+-    {
++    if (changed)
++    {    
+ 	g_signal_emit_by_name (G_OBJECT (presence_frame),
+ 			       "presence-actual", pi.presence, presence_message);
+     }
+@@ -532,7 +534,8 @@
+     account_presence = g_hash_table_lookup (priv->account_presence, account);
+ 
+     g_return_if_fail (account_presence != NULL);
+-    if (account_presence->presence == presence)
++    if (account_presence->presence == presence &&
++        !tp_strdiff (account_presence->message, presence_message))
+     {
+         g_debug ("%s: presence already set, not setting", G_STRFUNC);
+         return;

=== modified file 'changelog'
--- a/changelog	2008-01-05 18:47:21 +0000
+++ b/changelog	2008-01-05 18:58:05 +0000
@@ -1,7 +1,14 @@
 telepathy-mission-control (4.51-2) UNRELEASED; urgency=low
 
+  [ Laurent Bigonville ]
   * Bump Standards-Version
 
+  [ Sjoerd Simons ]
+  * debian/patches/add_signals_to_proxy.patch
+    - Added. Add some missing signals to the MC proxy object
+  * patches/emit_presence_changed_on_status_changed.patch
+    - Added. Also emit PresenceChanged if the status message changed
+
  -- Laurent Bigonville <bigon at bigon.be>  Sat, 05 Jan 2008 19:47:08 +0100
 
 telepathy-mission-control (4.51-1) unstable; urgency=low