Changeset 573dab0

Timestamp:

2010-04-13T10:20:04Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

81186cab

Parents:

3a9b123

Message:

Incoming typing notifications.

Files:

• irc_im.c (modified) (2 diffs)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_user.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)

irc_im.c

@@ -116 +116 @@
         g_free( wrapped );
         g_free( prefix );
+        
+        return TRUE;
+}
+
+static gboolean bee_irc_user_typing( bee_t *bee, bee_user_t *bu, uint32_t flags )
+{
+        irc_t *irc = (irc_t *) bee->ui_data;
+        
+        if( set_getbool( &bee->set, "typing_notice" ) )
+                irc_send_msg_f( (irc_user_t *) bu->ui_data, "PRIVMSG", irc->user->nick,
+                                "\001TYPING %d\001", ( flags >> 8 ) & 3 );
+        else
+                return FALSE;
         
         return TRUE;
@@ -193 +206 @@
         bee_irc_user_status,
         bee_irc_user_msg,
+        bee_irc_user_typing,
         
         bee_irc_ft_in_start,

protocols/bee.h

@@ -71 +71 @@
         gboolean (*user_status)( bee_t *bee, struct bee_user *bu, struct bee_user *old );
         gboolean (*user_msg)( bee_t *bee, bee_user_t *bu, const char *msg, time_t sent_at );
+        gboolean (*user_typing)( bee_t *bee, bee_user_t *bu, guint32 flags );
         
         struct file_transfer* (*ft_in_start)( bee_t *bee, bee_user_t *bu, const char *file_name, size_t file_size );

protocols/bee_user.c

@@ -194 +194 @@
                 imcb_log( ic, "Message from unknown handle %s:\n%s", handle, msg );
 }
+
+void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
+{
+        bee_user_t *bu;
+        
+        if( ic->bee->ui->user_typing &&
+            ( bu = bee_user_by_handle( ic->bee, ic, handle ) ) )
+        {
+                ic->bee->ui->user_typing( ic->bee, bu, flags );
+        }
+}

protocols/nogaim.c

@@ -525 +525 @@
         query_add( (irc_t *) ic->bee->ui_data, ic, s,
                    imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
-}
-
-void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
-{
-#if 0
-        user_t *u;
-        
-        if( !set_getbool( &ic->bee->set, "typing_notice" ) )
-                return;
-        
-        if( ( u = user_findhandle( ic, handle ) ) )
-        {
-                char buf[256]; 
-                
-                g_snprintf( buf, 256, "\1TYPING %d\1", ( flags >> 8 ) & 3 );
-                irc_privmsg( ic->irc, u, "PRIVMSG", ic->irc->nick, NULL, buf );
-        }
-#endif
 }