Changeset 81ee561 for protocols/jabber/iq.c

Timestamp:

2010-03-20T18:03:18Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

85693e6

Parents:

3330468 (diff), 0baed0d (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:

Merging head. Most changes are not so relevant because they're to IM
modules.

File:

• protocols/jabber/iq.c (modified) (3 diffs)

protocols/jabber/iq.c

@@ -307 +307 @@
                     strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
                         imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
-                
-                jd->flags &= ~JFLAG_WANT_BIND;
-        }
-        else if( node && ( c = xt_find_node( node->children, "session" ) ) )
-        {
-                jd->flags &= ~JFLAG_WANT_SESSION;
         }
         
@@ -319 +313 @@
                 reply = xt_new_node( "bind", NULL, xt_new_node( "resource", set_getstr( &ic->acc->set, "resource" ), NULL ) );
                 xt_add_attr( reply, "xmlns", XMLNS_BIND );
+                jd->flags &= ~JFLAG_WANT_BIND;
         }
         else if( jd->flags & JFLAG_WANT_SESSION )
@@ -324 +319 @@
                 reply = xt_new_node( "session", NULL, NULL );
                 xt_add_attr( reply, "xmlns", XMLNS_SESSION );
+                jd->flags &= ~JFLAG_WANT_SESSION;
         }