Changeset c5bc47b for protocols/yahoo/yahoo2_types.h

Timestamp:

2009-10-17T17:24:52Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c48a033

Parents:

0c41177 (diff), 2e44b1f (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:

Merging BitlBee 1.2.4.

File:

• protocols/yahoo/yahoo2_types.h (modified) (4 diffs)

protocols/yahoo/yahoo2_types.h

@@ -57 +57 @@
         YAHOO_LOGIN_LOCK = 14,
         YAHOO_LOGIN_DUPL = 99,
-        YAHOO_LOGIN_SOCK = -1
+        YAHOO_LOGIN_SOCK = -1,
+};
+
+enum ypacket_status {
+        YPACKET_STATUS_DISCONNECTED = -1,
+        YPACKET_STATUS_DEFAULT = 0,
+        YPACKET_STATUS_SERVERACK = 1,
+        YPACKET_STATUS_GAME     = 0x2,
+        YPACKET_STATUS_AWAY     = 0x4,
+        YPACKET_STATUS_CONTINUED = 0x5,
+        YPACKET_STATUS_INVISIBLE = 12,
+        YPACKET_STATUS_NOTIFY = 0x16, /* TYPING */
+        YPACKET_STATUS_WEBLOGIN = 0x5a55aa55,
+        YPACKET_STATUS_OFFLINE = 0x5a55aa56
 };
 
@@ -85 +98 @@
 };
 
-#define YAHOO_PROTO_VER 0x000b
+#define YAHOO_PROTO_VER 0x0010
 
 /* Yahoo style/color directives */
@@ -115 +128 @@
         YAHOO_CONNECTION_WEBCAM,
         YAHOO_CONNECTION_CHATCAT,
-        YAHOO_CONNECTION_SEARCH
+        YAHOO_CONNECTION_SEARCH,
+        YAHOO_CONNECTION_AUTH,
 };
 
@@ -131 +145 @@
 /* chat member attribs */
 #define YAHOO_CHAT_MALE 0x8000
-#define YAHOO_CHAT_FEMALE 0x10000
 #define YAHOO_CHAT_FEMALE 0x10000
 #define YAHOO_CHAT_DUNNO 0x400