[Telepathy-commits] [telepathy-gabble/master] remove resource argument from gabble_presence_as_message entirely, as it's only ever useful on your self_presence which only has one resource

[Robert McQueen]

20080727022741-418b8-166eb619558dc4ec5ad64c1bc1c9eec8c76283aa.gz
---
 src/connection.c |    3 +--
 src/presence.c   |    7 ++-----
 src/presence.h   |    3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 67c109e..3738423 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1244,9 +1244,8 @@ connection_shut_down (TpBaseConnection *base)
 gboolean
 _gabble_connection_signal_own_presence (GabbleConnection *self, GError **error)
 {
-  GabbleConnectionPrivate *priv = GABBLE_CONNECTION_GET_PRIVATE (self);
   GabblePresence *presence = self->self_presence;
-  LmMessage *message = gabble_presence_as_message (presence, priv->resource);
+  LmMessage *message = gabble_presence_as_message (presence);
   LmMessageNode *node = lm_message_get_node (message);
   gboolean ret;
   gchar *caps_hash;
diff --git a/src/presence.c b/src/presence.c
index 47409ec..42f19ba 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -365,16 +365,13 @@ OUT:
 }
 
 LmMessage *
-gabble_presence_as_message (GabblePresence *presence, const gchar *resource)
+gabble_presence_as_message (GabblePresence *presence)
 {
   GabblePresencePrivate *priv = GABBLE_PRESENCE_PRIV (presence);
   LmMessage *message;
   LmMessageNode *node, *subnode;
   LmMessageSubType subtype;
-  Resource *res = _find_resource (presence, resource);
-
-  if (res == NULL)
-    res = priv->resources->data;
+  Resource *res = priv->resources->data; /* pick first resource */
 
   g_assert (NULL != res);
 
diff --git a/src/presence.h b/src/presence.h
index c556be3..dd220a6 100644
--- a/src/presence.h
+++ b/src/presence.h
@@ -88,8 +88,7 @@ gboolean gabble_presence_resource_has_caps (GabblePresence *presence,
                                    const gchar *resource,
                                    GabblePresenceCapabilities caps);
 
-LmMessage *gabble_presence_as_message (GabblePresence *presence,
-    const gchar *resource);
+LmMessage *gabble_presence_as_message (GabblePresence *presence);
 gchar *gabble_presence_dump (GabblePresence *presence);
 
 G_END_DECLS
-- 
1.5.6.3