Changeset 4eb4c0f for protocols/jabber/iq.c

Timestamp:

2008-02-16T17:15:31Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (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 in upstream changes

File:

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

protocols/jabber/iq.c

@@ -92 +92 @@
                 else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
                 {
-                        const char *features[] = { XMLNS_VERSION,
+                        const char *features[] = { XMLNS_DISCOVER,
+                                                   XMLNS_VERSION,
                                                    XMLNS_TIME,
                                                    XMLNS_CHATSTATES,