Changeset 9779c18 for protocols/oscar/service.c

Timestamp:

2006-06-03T20:20:43Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

5973412

Parents:

a15c097 (diff), fb62f81f (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] Wilmer

File:

• protocols/oscar/service.c (modified) (3 diffs)

protocols/oscar/service.c

@@ -733 +733 @@
         int tlvlen;
 
-        data = AIM_ICQ_STATE_WEBAWARE | AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */
+        data = AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */
 
         tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
@@ -881 +881 @@
 #endif
 
+/* len can't be 0 here anyway...
                 } else if ((offset == 0x00001000) && (len == 0x00000000)) {
 
@@ -887 +888 @@
                         aimbs_put32(&fr->data, 0xe9800998);
                         aimbs_put32(&fr->data, 0xecf8427e);
-
+*/
                 } else
                         do_error_dialog(sess->aux_data, "WARNING: unknown hash request", "Gaim");