Changeset 22bf64e

Timestamp:

2005-12-13T23:27:58Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

11e090b, 703f0f7

Parents:

6aaa221 (diff), e7f46c5 (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:

Improved typing notification support. (from f0rked)

Location:

protocols

Files:

• msn/sb.c (modified) (1 diff)
• nogaim.c (modified) (2 diffs)
• nogaim.h (modified) (1 diff)
• oscar/oscar.c (modified) (1 diff)
• yahoo/yahoo.c (modified) (1 diff)

protocols/msn/sb.c

@@ -644 +644 @@
                         if( who )
                         {
-                                serv_got_typing( gc, who, 5 );
+                                serv_got_typing( gc, who, 5, 1 );
                                 g_free( who );
                         }

protocols/nogaim.c

@@ -697 +697 @@
 }
 
-void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout )
+void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type )
 {
         user_t *u;
@@ -704 +704 @@
                 return;
         
-        if( ( u = user_findhandle( gc, handle ) ) )
-                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
+        if( ( u = user_findhandle( gc, handle ) ) ) {
+                /* If type is:
+                 * 0: user has stopped typing
+                 * 1: user is actively typing
+                 * 2: user has entered text, but is not actively typing
+                 */
+                if (type == 0 || type == 1 || type == 2) {
+                        char buf[256]; 
+                        g_snprintf(buf, 256, "\1TYPING %d\1", type); 
+                        irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, buf );
+                }
+        }
 }
 

protocols/nogaim.h

@@ -300 +300 @@
 G_MODULE_EXPORT void serv_got_update( struct gaim_connection *gc, char *handle, int loggedin, int evil, time_t signon, time_t idle, int type, guint caps );
 G_MODULE_EXPORT void serv_got_im( struct gaim_connection *gc, char *handle, char *msg, guint32 flags, time_t mtime, gint len );
-G_MODULE_EXPORT void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout );
+G_MODULE_EXPORT void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type );
 G_MODULE_EXPORT void serv_got_chat_invite( struct gaim_connection *gc, char *handle, char *who, char *msg, GList *data );
 G_MODULE_EXPORT struct conversation *serv_got_joined_chat( struct gaim_connection *gc, int id, char *handle );

protocols/oscar/oscar.c

@@ -2451 +2451 @@
         type2 = va_arg(ap, int);
         va_end(ap);
-
-        if(type2 == 0x0001 || type2 == 0x0002)
-                serv_got_typing(gc, sn, 0);
-
+    
+        if(type2 == 0x0002) {
+                /* User is typing */
+                serv_got_typing(gc, sn, 0, 1);
+        } 
+        else if (type2 == 0x0001) {
+                /* User has typed something, but is not actively typing (stale) */
+                serv_got_typing(gc, sn, 0, 2);
+        }
+        else {
+                /* User has stopped typing */
+                serv_got_typing(gc, sn, 0, 0);
+        }        
+        
         return 1;
 }

protocols/yahoo/yahoo.c

@@ -641 +641 @@
 {
         struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        serv_got_typing( gc, who, 1 );
+        if (stat == 1) {
+                /* User is typing */
+                serv_got_typing( gc, who, 1, 1 );
+        }
+        else {
+                /* User stopped typing */
+                serv_got_typing( gc, who, 1, 0 );
+        }
 }