[Telepathy-commits] [telepathy-gabble/master] add a "to" argument to gabble_presence_as_message, as you can't change the recipient of an LmMessage after it's been created

[Robert McQueen]

20080727023441-418b8-32e10597064f33e4994ba5be32e092a4136e9ddc.gz
---
 src/connection.c |    2 +-
 src/presence.c   |    7 ++++---
 src/presence.h   |    3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 3738423..02159f4 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1245,7 +1245,7 @@ gboolean
 _gabble_connection_signal_own_presence (GabbleConnection *self, GError **error)
 {
   GabblePresence *presence = self->self_presence;
-  LmMessage *message = gabble_presence_as_message (presence);
+  LmMessage *message = gabble_presence_as_message (presence, NULL);
   LmMessageNode *node = lm_message_get_node (message);
   gboolean ret;
   gchar *caps_hash;
diff --git a/src/presence.c b/src/presence.c
index 42f19ba..31647f1 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -365,7 +365,8 @@ OUT:
 }
 
 LmMessage *
-gabble_presence_as_message (GabblePresence *presence)
+gabble_presence_as_message (GabblePresence *presence,
+                            const gchar *to)
 {
   GabblePresencePrivate *priv = GABBLE_PRESENCE_PRIV (presence);
   LmMessage *message;
@@ -380,7 +381,7 @@ gabble_presence_as_message (GabblePresence *presence)
   else
     subtype = LM_MESSAGE_SUB_TYPE_AVAILABLE;
 
-  message = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_PRESENCE,
+  message = lm_message_new_with_sub_type (to, LM_MESSAGE_TYPE_PRESENCE,
               subtype);
   node = lm_message_get_node (message);
 
@@ -408,7 +409,7 @@ gabble_presence_as_message (GabblePresence *presence)
     }
 
   if (presence->status_message)
-      lm_message_node_add_child (node, "status", presence->status_message);
+    lm_message_node_add_child (node, "status", presence->status_message);
 
   if (res->priority)
     {
diff --git a/src/presence.h b/src/presence.h
index dd220a6..5663a19 100644
--- a/src/presence.h
+++ b/src/presence.h
@@ -88,7 +88,8 @@ gboolean gabble_presence_resource_has_caps (GabblePresence *presence,
                                    const gchar *resource,
                                    GabblePresenceCapabilities caps);
 
-LmMessage *gabble_presence_as_message (GabblePresence *presence);
+LmMessage *gabble_presence_as_message (GabblePresence *presence,
+    const gchar *to);
 gchar *gabble_presence_dump (GabblePresence *presence);
 
 G_END_DECLS
-- 
1.5.6.3