Removed jid_is_room()

3 files changed, 1 insertions, 13 deletions

diff --git a/src/jabber.c b/src/jabber.c
index 16875eb4..2d69ebec 100644
--- a/src/jabber.c
+++ b/src/jabber.c
@@ -532,7 +532,7 @@ _groupchat_message_handler(xmpp_stanza_t * const stanza)
     Jid *jid = jid_create(room_jid);
 
     // handle room broadcasts
-    if (jid_is_room(room_jid)) {
+    if (jid->resourcepart == NULL) {
         xmpp_stanza_t *subject = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_SUBJECT);
 
         // handle subject
diff --git a/src/jid.c b/src/jid.c
index 8f98d211..66a066dd 100644
--- a/src/jid.c
+++ b/src/jid.c
@@ -179,17 +179,6 @@ create_full_room_jid(const char * const room, const char * const nick)
 }
 
 /*
- * Returns TRUE if the JID is a room JID
- * The test is that the passed JID does not contain a "/"
- */
-gboolean
-jid_is_room(const char * const room_jid)
-{
-    gchar *result = g_strrstr(room_jid, "/");
-    return (result == NULL);
-}
-
-/*
  * Get the room name part of the full JID, e.g.
  * Full JID = "test@conference.server/person"
  * returns "test@conference.server"
diff --git a/src/jid.h b/src/jid.h
index ab44090c..175c9ff3 100644
--- a/src/jid.h
+++ b/src/jid.h
@@ -41,7 +41,6 @@ Jid * jid_create_room_jid(const char * const room, const char * const nick);
 void jid_destroy(Jid *jid);
 
 gboolean jid_is_valid_room_form(Jid *jid);
-gboolean jid_is_room(const char * const room_jid);
 char * create_full_room_jid(const char * const room,
     const char * const nick);
 char * get_room_from_full_jid(const char * const full_room_jid);