# HG changeset patch # User Eric Warmenhoven # Date 989568373 0 # Node ID 31f7780b72b8c8ab5b7aa170a8bbcf73cc19d195 # Parent 703a567ec4bfae34df38469b473598055e18bcbc [gaim-migrate @ 1847] here you go mid committer: Tailor Script diff -r 703a567ec4bf -r 31f7780b72b8 src/oscar.c --- a/src/oscar.c Fri May 11 07:01:16 2001 +0000 +++ b/src/oscar.c Fri May 11 08:06:13 2001 +0000 @@ -55,6 +55,8 @@ #define USEROPT_SOCKSHOST 2 #define USEROPT_SOCKSPORT 3 +#define AIMHASHDATA "http://gaim.sourceforge.net/aim_data.php3" + int gaim_caps = AIM_CAPS_CHAT | AIM_CAPS_GETFILE | AIM_CAPS_IMIMAGE; static GtkWidget *join_chat_spin = NULL; @@ -637,8 +639,8 @@ g_free(pos); return; } - g_snprintf(buf, sizeof(buf), "GET http://gaim.sourceforge.net/aim_data.php3?" - "offset=%ld&len=%ld&modname=%s HTTP/1.0\n\n", + g_snprintf(buf, sizeof(buf), "GET " AIMHASHDATA + "?offset=%ld&len=%ld&modname=%s HTTP/1.0\n\n", pos->offset, pos->len, pos->modname ? pos->modname : ""); write(pos->conn->fd, buf, strlen(buf)); if (pos->modname) @@ -1499,6 +1501,7 @@ char buf[BUF_LONG]; struct gaim_connection *gc = sess->aux_data; va_list ap; + char *asc; va_start(ap, command); info = va_arg(ap, struct aim_userinfo_s *); @@ -1507,34 +1510,38 @@ infotype = (u_short)va_arg(ap, u_int); va_end(ap); - if (prof == NULL || !strlen(prof)) { - /* no info/away message */ - char buf[1024]; - sprintf(buf, _("%s has no %s."), info->sn, - (infotype == AIM_GETINFO_GENERALINFO) ? "information" : "away message"); - do_error_dialog(buf, _("Gaim - Error")); - plugin_event(event_error, (void *)977, 0, 0, 0); - return 1; - } - - g_snprintf(buf, sizeof buf, _("Username : %s %s
\n" - "Warning Level : %d %%
\n" - "Online Since : %s
\n" - "Idle Minutes : %d\n
\n

\n" - "%s" - "

Legend:

" - "

: Normal AIM User
" - "

: AOL User
" - "

: Trial AIM User
" - "

: Administrator"), - info->sn, images(info->flags), - info->warnlevel/10, - asctime(localtime(&info->onlinesince)), - info->idletime, - infotype == AIM_GETINFO_GENERALINFO ? prof : - away_subs(prof, gc->username)); + asc = g_strdup(asctime(localtime(&info->membersince))); + + g_snprintf(buf, sizeof buf, + _("Username : %s %s
\n" + "Member Since : %s\n" + "Warning Level : %d %%
\n" + "Online Since : %s
\n" + "Idle Minutes : %d\n
\n

\n" + "%s" + "

Legend:

" + "

: Normal AIM User
" + "

: AOL User
" + "

: Trial AIM User
" + "

: Administrator"), + info->sn, images(info->flags), + asc, + info->warnlevel/10, + asctime(localtime(&info->onlinesince)), + info->idletime, + (prof && strlen(prof)) ? + (infotype == AIM_GETINFO_GENERALINFO ? + prof : + away_subs(prof, gc->username)) + : + (infotype == AIM_GETINFO_GENERALINFO ? + _("No Information Provided") : + _("User has no away message"))); + g_show_info_text(away_subs(buf, gc->username)); + g_free(asc); + return 1; }