Changeset dd788bb

Timestamp:

2006-09-21T07:32:39Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4a0614e

Parents:

0b4a0db

Message:

Added enough to not make it crash on login, and it can properly receive
messages now. Just try to figure out why it doesn't get typing
notifications...

Location:

protocols/jabber

Files:

• jabber.c (modified) (2 diffs)
• message.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -112 +112 @@
 }
 
+static GList *jabber_away_states( struct gaim_connection *gc )
+{
+        GList *l = NULL;
+        
+        l = g_list_append( l, (void*) "Online" );
+        l = g_list_append( l, (void*) "Away" );
+        l = g_list_append( l, (void*) "Extended Away" );
+        l = g_list_append( l, (void*) "Do Not Disturb" );
+        
+        return( l );
+}
+
+static void jabber_set_away( struct gaim_connection *gc, char *state, char *message )
+{
+}
+
 void jabber_init()
 {
@@ -121 +137 @@
         ret->close = jabber_close;
         ret->send_im = jabber_send_im;
-//      ret->away_states = jabber_away_states;
+        ret->away_states = jabber_away_states;
 //      ret->get_status_string = jabber_get_status_string;
-//      ret->set_away = jabber_set_away;
+        ret->set_away = jabber_set_away;
 //      ret->set_info = jabber_set_info;
 //      ret->get_info = jabber_get_info;

protocols/jabber/message.c

@@ -26 +26 @@
 xt_status jabber_pkt_message( struct xt_node *node, gpointer data )
 {
+        struct gaim_connection *gc = data;
         char *from = xt_find_attr( node, "from" );
+        char *type = xt_find_attr( node, "type" );
         struct xt_node *msg = xt_find_node( node->children, "body" );
         
-        printf( "Received MSG from %s: %s\n", from, msg ? msg->text : "<null>" );
-        xt_print( node );
+        if( !type || !msg )
+                return XT_HANDLED;      /* Grmbl... FIXME */
+        
+        if( strcmp( type, "chat" ) == 0 )
+        {
+                char *s;
+                
+                s = strchr( from, '/' );
+                if( s )
+                        *s = 0;
+                
+                serv_got_im( gc, from, msg->text, 0, 0, 0 );
+                
+                if( s )
+                        *s = '/';
+        }
+        else
+        {
+                printf( "Received MSG from %s: %s\n", from, msg ? msg->text : "<null>" );
+                xt_print( node );
+        }
         
         return XT_HANDLED;