Mercurial > pidgin
comparison src/protocols/oscar/oscar.c @ 7141:af8ac078d4c2
[gaim-migrate @ 7708]
I guess I changed "everybuddy bug" to "ICQ Direct Connect" in the tooltips.
And then there's some other comment changes and stuff that were in my tree.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 04 Oct 2003 20:14:25 +0000 |
parents | 8246bd3141ae |
children | f6de82a25d5f |
comparison
equal
deleted
inserted
replaced
7140:48cc5d5d5a6c | 7141:af8ac078d4c2 |
---|---|
1774 (info->icqinfo.status != AIM_ICQ_STATE_NORMAL)) { | 1774 (info->icqinfo.status != AIM_ICQ_STATE_NORMAL)) { |
1775 type |= UC_UNAVAILABLE; | 1775 type |= UC_UNAVAILABLE; |
1776 } | 1776 } |
1777 } | 1777 } |
1778 | 1778 |
1779 if (caps & AIM_CAPS_ICQ) | 1779 if (caps & AIM_CAPS_ICQ_DIRECT) |
1780 caps ^= AIM_CAPS_ICQ; | 1780 caps ^= AIM_CAPS_ICQ_DIRECT; |
1781 | 1781 |
1782 if (info->present & AIM_USERINFO_PRESENT_IDLE) { | 1782 if (info->present & AIM_USERINFO_PRESENT_IDLE) { |
1783 time(&time_idle); | 1783 time(&time_idle); |
1784 time_idle -= info->idletime*60; | 1784 time_idle -= info->idletime*60; |
1785 } | 1785 } |
3009 } | 3009 } |
3010 | 3010 |
3011 return 1; | 3011 return 1; |
3012 } | 3012 } |
3013 | 3013 |
3014 /* | |
3015 * We get this error when there was an error in the locate family. This | |
3016 * usually happens because libfaim couldn't get info for someone when it | |
3017 * tried automatically. Seeing the message gets annoying... | |
3018 */ | |
3014 static int gaim_parse_locerr(aim_session_t *sess, aim_frame_t *fr, ...) { | 3019 static int gaim_parse_locerr(aim_session_t *sess, aim_frame_t *fr, ...) { |
3015 char *buf; | 3020 /* char *buf; */ |
3016 va_list ap; | 3021 va_list ap; |
3017 fu16_t reason; | 3022 fu16_t reason; |
3018 char *destn; | 3023 char *destn; |
3019 | 3024 |
3020 va_start(ap, fr); | 3025 va_start(ap, fr); |
3021 reason = (fu16_t) va_arg(ap, unsigned int); | 3026 reason = (fu16_t) va_arg(ap, unsigned int); |
3022 destn = va_arg(ap, char *); | 3027 destn = va_arg(ap, char *); |
3023 va_end(ap); | 3028 va_end(ap); |
3024 | 3029 |
3030 /* | |
3025 buf = g_strdup_printf(_("User information for %s unavailable:"), destn); | 3031 buf = g_strdup_printf(_("User information for %s unavailable:"), destn); |
3026 gaim_notify_error(sess->aux_data, NULL, buf, | 3032 gaim_notify_error(sess->aux_data, NULL, buf, |
3027 (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("No reason given.")); | 3033 (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("No reason given.")); |
3028 g_free(buf); | 3034 g_free(buf); |
3035 */ | |
3029 | 3036 |
3030 return 1; | 3037 return 1; |
3031 } | 3038 } |
3032 | 3039 |
3033 #if 0 | 3040 #if 0 |
3061 break; | 3068 break; |
3062 case AIM_CAPS_VOICE: | 3069 case AIM_CAPS_VOICE: |
3063 tmp = _("Voice"); | 3070 tmp = _("Voice"); |
3064 break; | 3071 break; |
3065 case AIM_CAPS_DIRECTIM: | 3072 case AIM_CAPS_DIRECTIM: |
3066 tmp = _("Direct IM"); | 3073 tmp = _("AIM Direct IM"); |
3067 break; | 3074 break; |
3068 case AIM_CAPS_CHAT: | 3075 case AIM_CAPS_CHAT: |
3069 tmp = _("Chat"); | 3076 tmp = _("Chat"); |
3070 break; | 3077 break; |
3071 case AIM_CAPS_GETFILE: | 3078 case AIM_CAPS_GETFILE: |
3082 tmp = _("Add-Ins"); | 3089 tmp = _("Add-Ins"); |
3083 break; | 3090 break; |
3084 case AIM_CAPS_SENDBUDDYLIST: | 3091 case AIM_CAPS_SENDBUDDYLIST: |
3085 tmp = _("Send Buddy List"); | 3092 tmp = _("Send Buddy List"); |
3086 break; | 3093 break; |
3087 case AIM_CAPS_ICQ: | 3094 case AIM_CAPS_ICQ_DIRECT: |
3088 tmp = _("EveryBuddy Bug"); | 3095 tmp = _("ICQ Direct Connect"); |
3089 break; | 3096 break; |
3090 case AIM_CAPS_APINFO: | 3097 case AIM_CAPS_APINFO: |
3091 tmp = _("AP User"); | 3098 tmp = _("AP User"); |
3092 break; | 3099 break; |
3093 case AIM_CAPS_ICQRTF: | 3100 case AIM_CAPS_ICQRTF: |