Changeset deff040

Timestamp:

2006-09-21T19:48:17Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5997488

Parents:

5bcf70a

Message:

Implemented set_away() (VERY simple version, have to add an away state
table like in the MSN module), added sending of keepalive "packets" and
removed old main() code (for testing only) from jabber.c.

Location:

protocols/jabber

Files:

• jabber.c (modified) (4 diffs)
• jabber.h (modified) (1 diff)
• presence.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -122 +122 @@
 }
 
+/* TODO: For away state handling, implement some list like the one for MSN. */
 static GList *jabber_away_states( struct gaim_connection *gc )
 {
@@ -136 +137 @@
 static void jabber_set_away( struct gaim_connection *gc, char *state, char *message )
 {
+        /* For now let's just always set state to "away" and send the message, if available. */
+        presence_send( gc, NULL, g_strcasecmp( state, "Online" ) == 0 ? NULL : "away", message );
+}
+
+static void jabber_keepalive( struct gaim_connection *gc )
+{
+        /* Just any whitespace character is enough as a keepalive for XMPP sessions. */
+        jabber_write( gc, "\n", 1 );
 }
 
 void jabber_init()
 {
-        struct prpl *ret = g_new0(struct prpl, 1);
+        struct prpl *ret = g_new0( struct prpl, 1 );
         
         ret->name = "jabber";
@@ -158 +167 @@
 //      ret->chat_leave = jabber_chat_leave;
 //      ret->chat_open = jabber_chat_open;
-//      ret->keepalive = jabber_keepalive;
+        ret->keepalive = jabber_keepalive;
 //      ret->add_permit = jabber_add_permit;
 //      ret->rem_permit = jabber_rem_permit;
@@ -166 +175 @@
         ret->handle_cmp = g_strcasecmp;
 
-        register_protocol(ret);
+        register_protocol( ret );
 }
-
-#if 0
-int main( int argc, char *argv[] )
-{
-        struct xt_parser *xt = xt_new( NULL );
-        struct xt_node *msg;
-        int i;
-        char buf[512];
-        
-        msg = xt_new_node( "message", NULL, xt_new_node( "body", "blaataap-test", NULL ) );
-        xt_add_child( msg, xt_new_node( "html", NULL, xt_new_node( "body", "<b>blaataap in html</b>", NULL ) ) );
-        xt_add_attr( msg, "xmlns", "jabber:client" );
-        xt_add_attr( xt_find_node( msg->children, "html" ), "xmlns", "html rotte zooi" );
-        printf( "%s\n", xt_to_string( msg ) );
-        
-        while( ( i = read( 0, buf, 512 ) ) > 0 )
-        {
-                if( xt_feed( xt, buf, i ) < 1 )
-                        break;
-        }
-        xt->handlers = jabber_handlers;
-        xt_handle( xt, NULL );
-        
-        xt_cleanup( xt, NULL );
-        printf( "%d\n", xt->root );
-        
-        xt_free( xt );
-}
-#endif

protocols/jabber/jabber.h

@@ -46 +46 @@
 xt_status jabber_pkt_presence( struct xt_node *node, gpointer data );
 int presence_announce( struct gaim_connection *gc );
+int presence_send( struct gaim_connection *gc, char *to, char *show, char *status );
 
 /* jabber_util.c */

protocols/jabber/presence.c

@@ -54 +54 @@
 }
 
+/* Send the <presence/> tag that finalizes the whole login process, from here
+   we'll actually show up as online to our buddies. */
 int presence_announce( struct gaim_connection *gc )
 {
@@ -69 +71 @@
         return st;
 }
+
+int presence_send( struct gaim_connection *gc, char *to, char *show, char *status )
+{
+        struct xt_node *node;
+        int st;
+        
+        node = jabber_make_packet( "presence", NULL, to, NULL );
+        if( show )
+                xt_add_child( node, xt_new_node( "show", show, NULL ) );
+        if( status )
+                xt_add_child( node, xt_new_node( "status", status, NULL ) );
+        
+        st = jabber_write_packet( gc, node );
+        
+        xt_free_node( node );
+        return st;
+}