comparison libpurple/protocols/qq/buddy_info.c @ 25890:43b721aa4b76

explicit merge of '32d4ce0b6cfc9ccb9a6e7ed661423b9260a0bead' and '0bcc8cd8e68241cf9c13be5b28ced3a4a5d4e488'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:28:34 +0000
parents 1260a3fb60f4 0d7c21b5f1d7
children 4b8c4870b13a
comparison
equal deleted inserted replaced
25889:e2b193decaa5 25890:43b721aa4b76
788 while (data_len - bytes >= 12) { 788 while (data_len - bytes >= 12) {
789 bytes += qq_get32(&uid, data + bytes); 789 bytes += qq_get32(&uid, data + bytes);
790 bytes += qq_get32(&onlineTime, data + bytes); 790 bytes += qq_get32(&onlineTime, data + bytes);
791 bytes += qq_get16(&level, data + bytes); 791 bytes += qq_get16(&level, data + bytes);
792 bytes += qq_get16(&timeRemainder, data + bytes); 792 bytes += qq_get16(&timeRemainder, data + bytes);
793 purple_debug_info("QQ", "level: %d, uid %d, tmOnline: %d, tmRemainder: %d\n", 793 purple_debug_info("QQ", "level: %d, uid %u, tmOnline: %d, tmRemainder: %d\n",
794 level, uid, onlineTime, timeRemainder); 794 level, uid, onlineTime, timeRemainder);
795 795
796 bd = qq_buddy_data_find(gc, uid); 796 bd = qq_buddy_data_find(gc, uid);
797 if (bd == NULL) { 797 if (bd == NULL) {
798 purple_debug_error("QQ", "Got levels of %u not in my buddy list\n", uid); 798 purple_debug_error("QQ", "Got levels of %u not in my buddy list\n", uid);
823 bytes = 0; 823 bytes = 0;
824 bytes += qq_get32(&uid, data + bytes); 824 bytes += qq_get32(&uid, data + bytes);
825 bytes += qq_get32(&onlineTime, data + bytes); 825 bytes += qq_get32(&onlineTime, data + bytes);
826 bytes += qq_get16(&level, data + bytes); 826 bytes += qq_get16(&level, data + bytes);
827 bytes += qq_get16(&timeRemainder, data + bytes); 827 bytes += qq_get16(&timeRemainder, data + bytes);
828 purple_debug_info("QQ", "level: %d, uid %d, tmOnline: %d, tmRemainder: %d\n", 828 purple_debug_info("QQ", "level: %d, uid %u, tmOnline: %d, tmRemainder: %d\n",
829 level, uid, onlineTime, timeRemainder); 829 level, uid, onlineTime, timeRemainder);
830 830
831 bd = qq_buddy_data_find(gc, uid); 831 bd = qq_buddy_data_find(gc, uid);
832 if (bd == NULL) { 832 if (bd == NULL) {
833 purple_debug_error("QQ", "Got levels of %d not in my buddy list\n", uid); 833 purple_debug_error("QQ", "Got levels of %u not in my buddy list\n", uid);
834 return; 834 return;
835 } 835 }
836 836
837 bd->onlineTime = onlineTime; 837 bd->onlineTime = onlineTime;
838 bd->level = level; 838 bd->level = level;