Changeset 4022b68 for protocols/purple/purple.c

Timestamp:

2010-08-21T22:42:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fd424c8

Parents:

327af51 (diff), c00dd71 (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:

Merge mainline.

File:

• protocols/purple/purple.c (modified) (4 diffs)

protocols/purple/purple.c

@@ -427 +427 @@
 {
         PurpleTypingState state = PURPLE_NOT_TYPING;
-        PurpleConversation *conv;
+        PurpleAccount *pa = ic->proto_data;
         
         if( flags & OPT_TYPING )
@@ -434 +434 @@
                 state = PURPLE_TYPED;
         
-        if( ( conv = purple_find_conversation_with_account( PURPLE_CONV_TYPE_IM,
-                                                            who, ic->proto_data ) ) == NULL )
-        {
-                purple_conv_im_set_typing_state( purple_conversation_get_im_data( conv ), state );
-                return 1;
-        }
-        else
-        {
-                return 0;
-        }
+        serv_send_typing( purple_account_get_connection( pa ), who, state );
+        
+        return 1;
 }
 
@@ -807 +800 @@
         
         imcb_buddy_msg( ic, (char*) who, (char*) message, 0, mtime );
+}
+
+/* No, this is not a ui_op but a signal. */
+static void prplcb_buddy_typing( PurpleAccount *account, const char *who, gpointer null )
+{
+        PurpleConversation *conv;
+        PurpleConvIm *im;
+        int state;
+        
+        if( ( conv = purple_find_conversation_with_account( PURPLE_CONV_TYPE_IM, who, account ) ) == NULL )
+                return;
+        
+        im = PURPLE_CONV_IM(conv);
+        switch( purple_conv_im_get_typing_state( im ) )
+        {
+        case PURPLE_TYPING:
+                state = OPT_TYPING;
+                break;
+        case PURPLE_TYPED:
+                state = OPT_THINKING;
+                break;
+        default:
+                state = 0;
+        }
+        
+        imcb_buddy_typing( purple_ic_by_pa( account ), who, state );
 }
 
@@ -1139 +1158 @@
         purple_prefs_load();
         
+        /* No, really. So far there were ui_ops for everything, but now suddenly
+           one needs to use signals for typing notification stuff. :-( */
+        purple_signal_connect( purple_conversations_get_handle(), "buddy-typing",
+                               &funcs, PURPLE_CALLBACK(prplcb_buddy_typing), NULL );
+        purple_signal_connect( purple_conversations_get_handle(), "buddy-typed",
+                               &funcs, PURPLE_CALLBACK(prplcb_buddy_typing), NULL );
+        purple_signal_connect( purple_conversations_get_handle(), "buddy-typing-stopped",
+                               &funcs, PURPLE_CALLBACK(prplcb_buddy_typing), NULL );
+        
         memset( &funcs, 0, sizeof( funcs ) );
         funcs.login = purple_login;