Changeset 85d7b85 for protocols/yahoo/yahoo2_types.h

Timestamp:

2008-04-02T14:22:57Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f9dbc99

Parents:

875ad42 (diff), dd34575 (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 trunk.

File:

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

protocols/yahoo/yahoo2_types.h

@@ -30 +30 @@
 
 enum yahoo_status {
+        YAHOO_STATUS_DISCONNECTED = -1,
         YAHOO_STATUS_AVAILABLE = 0,
         YAHOO_STATUS_BRB,
@@ -43 +44 @@
         YAHOO_STATUS_CUSTOM = 99,
         YAHOO_STATUS_IDLE = 999,
+        YAHOO_STATUS_WEBLOGIN = 0x5a55aa55,
         YAHOO_STATUS_OFFLINE = 0x5a55aa56, /* don't ask */
-        YAHOO_STATUS_NOTIFY = 0x16
+        YAHOO_STATUS_NOTIFY = 0x16 /* TYPING */
 };
 #define YAHOO_STATUS_GAME       0x2             /* Games don't fit into the regular status model */
@@ -50 +52 @@
 enum yahoo_login_status {
         YAHOO_LOGIN_OK = 0,
+        YAHOO_LOGIN_LOGOFF = 2,
         YAHOO_LOGIN_UNAME = 3,
         YAHOO_LOGIN_PASSWD = 13,
@@ -58 +61 @@
 
 enum yahoo_error {
+        E_UNKNOWN = -1,
+        E_CONNECTION = -2,
+        E_SYSTEM = -3,
         E_CUSTOM = 0,
 
@@ -79 +85 @@
 };
 
+#define YAHOO_PROTO_VER 0x000b
 
 /* Yahoo style/color directives */
@@ -116 +123 @@
 };
 
+enum yahoo_stealth_visibility_type {
+        YAHOO_STEALTH_DEFAULT = 0,
+        YAHOO_STEALTH_ONLINE,
+        YAHOO_STEALTH_PERM_OFFLINE
+};
+
 /* chat member attribs */
 #define YAHOO_CHAT_MALE 0x8000