Changeset 5bcf70a

Timestamp:

2006-09-21T18:44:34Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

deff040

Parents:

4a0614e

Message:

Now also sending <presence type="unavailable"/> tag on disconnect, as
recommended by rfc3921/5.1.5.

Location:

protocols/jabber

Files:

• io.c (modified) (1 diff)
• jabber.h (modified) (1 diff)

protocols/jabber/io.c

@@ -235 +235 @@
 }
 
-gboolean jabber_end_stream( struct gaim_connection *gc )
-{
-        struct jabber_data *jd = gc->proto_data;
-        char eos[] = "</stream:stream>";
+void jabber_end_stream( struct gaim_connection *gc )
+{
+        struct jabber_data *jd = gc->proto_data;
         
         /* Let's only do this if the queue is currently empty, otherwise it'd
            take too long anyway. */
-        if( jd->tx_len > 0 )
-                return TRUE;
-        else
-                return jabber_write( gc, eos, strlen( eos ) );
-}
+        if( jd->tx_len == 0 )
+        {
+                char eos[] = "</stream:stream>";
+                struct xt_node *node;
+                int st;
+                
+                node = jabber_make_packet( "presence", "unavailable", NULL, NULL );
+                st = jabber_write_packet( gc, node );
+                xt_free_node( node );
+                
+                if( st )
+                        jabber_write( gc, eos, strlen( eos ) );
+        }
+}

protocols/jabber/jabber.h

@@ -57 +57 @@
 gboolean jabber_connected_plain( gpointer data, gint source, b_input_condition cond );
 gboolean jabber_start_stream( struct gaim_connection *gc );
-gboolean jabber_end_stream( struct gaim_connection *gc );
+void jabber_end_stream( struct gaim_connection *gc );
 
 struct jabber_data