comparison: src/protocols/oscar/oscar.c
src/protocols/oscar/oscar.c
- changeset 6857
- fd79da71b071
- parent 6846
- f814f02dca87
- child 6871
- ff864e84ca84
equal
deleted
inserted
replaced
| 6856:5ed6b8356ebc | 6857:fd79da71b071 |
|---|---|
| 153 struct buddyinfo { | 153 struct buddyinfo { |
| 154 time_t signon; | 154 time_t signon; |
| 155 int caps; | 155 int caps; |
| 156 gboolean typingnot; | 156 gboolean typingnot; |
| 157 gchar *availmsg; | 157 gchar *availmsg; |
| 158 fu32_t ipaddr; | |
| 158 | 159 |
| 159 unsigned long ico_me_len; | 160 unsigned long ico_me_len; |
| 160 unsigned long ico_me_csum; | 161 unsigned long ico_me_csum; |
| 161 time_t ico_me_time; | 162 time_t ico_me_time; |
| 162 gboolean ico_informed; | 163 gboolean ico_informed; |
| 1815 bi->signon = info->onlinesince ? info->onlinesince : (info->sessionlen + time(NULL)); | 1816 bi->signon = info->onlinesince ? info->onlinesince : (info->sessionlen + time(NULL)); |
| 1816 if (caps) | 1817 if (caps) |
| 1817 bi->caps = caps; | 1818 bi->caps = caps; |
| 1818 bi->typingnot = FALSE; | 1819 bi->typingnot = FALSE; |
| 1819 bi->ico_informed = FALSE; | 1820 bi->ico_informed = FALSE; |
| 1821 bi->ipaddr = info->icqinfo.ipaddr; | |
| 1822 | |
| 1823 /* Available message stuff */ | |
| 1820 free(bi->availmsg); | 1824 free(bi->availmsg); |
| 1821 if (info->availmsg) | 1825 if (info->availmsg) |
| 1822 if (info->availmsg_encoding) { | 1826 if (info->availmsg_encoding) { |
| 1823 gchar *enc = g_strdup_printf("charset=\"%s\"", info->availmsg_encoding); | 1827 gchar *enc = g_strdup_printf("charset=\"%s\"", info->availmsg_encoding); |
| 1824 bi->availmsg = oscar_encoding_to_utf8(enc, info->availmsg, info->availmsg_len); | 1828 bi->availmsg = oscar_encoding_to_utf8(enc, info->availmsg, info->availmsg_len); |
| 5443 tmp = yay; | 5447 tmp = yay; |
| 5444 yay = g_strconcat(tmp, _("<b>Logged In:</b> "), tstr, "\n", NULL); | 5448 yay = g_strconcat(tmp, _("<b>Logged In:</b> "), tstr, "\n", NULL); |
| 5445 free(tmp); | 5449 free(tmp); |
| 5446 free(tstr); | 5450 free(tstr); |
| 5447 | 5451 |
| 5452 if (bi->ipaddr) { | |
| 5453 char *tstr = g_strdup_printf("%hhd.%hhd.%hhd.%hhd", | |
| 5454 (bi->ipaddr & 0xff000000) >> 24, | |
| 5455 (bi->ipaddr & 0x00ff0000) >> 16, | |
| 5456 (bi->ipaddr & 0x0000ff00) >> 8, | |
| 5457 (bi->ipaddr & 0x000000ff)); | |
| 5458 tmp = yay; | |
| 5459 yay = g_strconcat(tmp, _("<b>IP Address:</b> "), tstr, "\n", NULL); | |
| 5460 free(tmp); | |
| 5461 free(tstr); | |
| 5462 } | |
| 5463 | |
| 5448 if (bi->caps) { | 5464 if (bi->caps) { |
| 5449 char *caps = caps_string(bi->caps); | 5465 char *caps = caps_string(bi->caps); |
| 5450 tmp = yay; | 5466 tmp = yay; |
| 5451 yay = g_strconcat(tmp, _("<b>Capabilities:</b> "), caps, "\n", NULL); | 5467 yay = g_strconcat(tmp, _("<b>Capabilities:</b> "), caps, "\n", NULL); |
| 5452 free(tmp); | 5468 free(tmp); |
