Changeset 6e9ae72 for protocols/oscar/chatnav.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

• protocols/oscar/chatnav.c (modified) (2 diffs)

protocols/oscar/chatnav.c

@@ -139 +139 @@
                  * Type 0x0002: Unknown
                  */
-                if (aim_gettlv(innerlist, 0x0002, 1)) {
-                        guint16 classperms;
-
-                        classperms = aim_gettlv16(innerlist, 0x0002, 1);
-                        
-                }
+                if (aim_gettlv(innerlist, 0x0002, 1))
+                        ;
 
                 /*
@@ -205 +201 @@
                  */
                 if (aim_gettlv(innerlist, 0x00d5, 1)) {
-                        guint8 createperms;
-
-                        createperms = aim_gettlv8(innerlist, 0x00d5, 1);
+                        aim_gettlv8(innerlist, 0x00d5, 1); /* createperms */
                 }