Changeset b75671d for protocols/jabber/jabber_util.c

Timestamp:

2015-06-17T22:47:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into parson

File:

• protocols/jabber/jabber_util.c (modified) (1 diff)

protocols/jabber/jabber_util.c

@@ -820 +820 @@
         return TRUE;
 }
+
+/* Returns new reference! g_free() afterwards. */
+char *jabber_get_bare_jid(char *jid)
+{
+        char *s = NULL;
+
+        if (jid == NULL) {
+                return NULL;
+        }
+
+        if ((s = strchr(jid, '/'))) {
+                return g_strndup(jid, s - jid);
+        } else {
+                return g_strdup(jid);
+        }
+}