Changeset df1fb67

Timestamp:

2007-04-21T05:18:40Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c737ba7

Parents:

17fa798

Message:

Consistency; Using OPT_T(YP|HINK)ING for outgoing typing notfication crap
too.

Files:

• irc.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)

irc.c

@@ -1002 +1002 @@
                                 if( current_typing_notice - u->last_typing_notice >= 5 )
                                 {
-                                        u->ic->acc->prpl->send_typing( u->ic, u->handle, s[8] == '1' );
+                                        u->ic->acc->prpl->send_typing( u->ic, u->handle, ( s[8] - '0' ) << 8 );
                                         u->last_typing_notice = current_typing_notice;
                                 }

protocols/jabber/jabber.c

@@ -358 +358 @@
                 int st;
                 
-                if( typing == 0 )
+                if( typing & OPT_TYPING )
+                        type = "composing";
+                else if( typing & OPT_THINKING )
+                        type = "paused";
+                else
                         type = "active";
-                else if( typing == 2 )
-                        type = "paused";
-                else /* if( typing == 1 ) */
-                        type = "composing";
                 
                 node = xt_new_node( type, NULL, NULL );

protocols/msn/msn.c

@@ -342 +342 @@
 static int msn_send_typing( struct im_connection *ic, char *who, int typing )
 {
-        if( typing )
+        if( typing & OPT_TYPING )
                 return( msn_buddy_msg( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
         else

protocols/nogaim.h

@@ -61 +61 @@
 #define OPT_AWAY        0x00000004
 #define OPT_DOES_HTML   0x00000010
-#define OPT_TYPING      0x00000100
-#define OPT_THINKING    0x00000200
+#define OPT_TYPING      0x00000100 /* Some pieces of code make assumptions */
+#define OPT_THINKING    0x00000200 /* about these values... Stupid me! */
 
 /* ok. now the fun begins. first we create a connection structure */

protocols/oscar/oscar.c

@@ -2448 +2448 @@
 {
         struct oscar_data *od = ic->proto_data;
-        return( aim_im_sendmtn(od->sess, 1, who, typing ? 0x0002 : 0x0000) );
+        return( aim_im_sendmtn(od->sess, 1, who, (typing & OPT_TYPING) ? 0x0002 : 0x0000) );
 }
 

protocols/yahoo/yahoo.c

@@ -187 +187 @@
         struct byahoo_data *yd = ic->proto_data;
         
-        yahoo_send_typing( yd->y2_id, NULL, who, typing );
+        yahoo_send_typing( yd->y2_id, NULL, who, ( typing & OPT_TYPING ) != 0 );
         
         return 1;