Changeset 4022b68 for protocols

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.

Location:

protocols

Files:

• bee.c (modified) (1 diff)
• bee.h (modified) (1 diff)
• bee_user.c (modified) (2 diffs)
• nogaim.h (modified) (2 diffs)
• oscar/oscar.c (modified) (1 diff)
• purple/purple.c (modified) (4 diffs)
• yahoo/yahoo.c (modified) (1 diff)

protocols/bee.c

@@ -40 +40 @@
         s = set_add( &b->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, b );
         s = set_add( &b->set, "debug", "false", set_eval_bool, b );
+        s = set_add( &b->set, "mobile_is_away", "false", set_eval_bool, b );
         s = set_add( &b->set, "save_on_quit", "true", set_eval_bool, b );
         s = set_add( &b->set, "status", NULL, set_eval_away_status, b );

protocols/bee.h

@@ -56 +56 @@
 void bee_free( bee_t *b );
 
+/* TODO(wilmer): Kill at least the OPT_ flags that have an equivalent here. */
 typedef enum
 {
         BEE_USER_ONLINE = 1,    /* Compatibility with old OPT_LOGGED_IN flag */
         BEE_USER_AWAY = 4,      /* Compatibility with old OPT_AWAY flag */
+        BEE_USER_MOBILE = 8,    /* Compatibility with old OPT_MOBILE flag */
         BEE_USER_LOCAL = 256,   /* Locally-added contacts (not in real contact list) */
 } bee_user_flags_t;

protocols/bee_user.c

@@ -195 +195 @@
                 bu->status = NULL;
         
+        if( bu->status == NULL && ( flags & OPT_MOBILE ) &&
+            set_getbool( &bee->set, "mobile_is_away" ) )
+        {
+                bu->flags |= BEE_USER_AWAY;
+                bu->status = g_strdup( "Mobile" );
+        }
+        
         if( bee->ui->user_status )
                 bee->ui->user_status( bee, bu, old );
@@ -268 +275 @@
 }
 
-void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
+void imcb_buddy_typing( struct im_connection *ic, const char *handle, uint32_t flags )
 {
         bee_user_t *bu;

protocols/nogaim.h

@@ -63 +63 @@
 #define OPT_LOGGING_OUT 0x00000002
 #define OPT_AWAY        0x00000004
+#define OPT_MOBILE      0x00000008
 #define OPT_DOES_HTML   0x00000010
 #define OPT_LOCALBUDDY  0x00000020 /* For nicks local to one groupchat */
@@ -312 +313 @@
 G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick );
 
-G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags );
+G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, const char *handle, uint32_t flags );
 G_MODULE_EXPORT struct bee_user *imcb_buddy_by_handle( struct im_connection *ic, const char *handle );
 G_MODULE_EXPORT void imcb_clean_handle( struct im_connection *ic, char *handle );

protocols/oscar/oscar.c

@@ -898 +898 @@
                         flags |= OPT_AWAY;
         }
+        
+        /* Maybe this should be done just for AIM contacts, not sure. */
+        if (info->flags & AIM_FLAG_WIRELESS)
+                flags |= OPT_MOBILE;
         
         if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS) {

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;

protocols/yahoo/yahoo.c

@@ -589 +589 @@
         if( away )
                 flags |= OPT_AWAY;
+        if( mobile )
+                flags |= OPT_MOBILE;
         
         switch (stat)