Mercurial > pidgin
changeset 2833:cdbe6e2f0ff2
[gaim-migrate @ 2846]
icy cube
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sun, 02 Dec 2001 10:08:09 +0000 |
| parents | e0eeda0a9ab9 |
| children | 66b1112d948f |
| files | src/protocols/oscar/oscar.c |
| diffstat | 1 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Sun Dec 02 08:33:13 2001 +0000 +++ b/src/protocols/oscar/oscar.c Sun Dec 02 10:08:09 2001 +0000 @@ -457,7 +457,7 @@ odata->icq = TRUE; /* this is odd but it's necessary for a proper do_import and do_export */ gc->protocol = PROTO_ICQ; - gc->checkbox = _("Send offline message"); + gc->password[9] = 0; } else { gc->protocol = PROTO_TOC; gc->flags |= OPT_CONN_HTML; @@ -2238,8 +2238,6 @@ } else { if (imflags & IM_FLAG_AWAY) { ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message); - } else if (imflags & IM_FLAG_CHECKBOX) { - ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_OFFLINE, message); } else { struct aim_sendimext_args args; GSList *h = odata->hasicons; @@ -2248,6 +2246,8 @@ struct stat st; args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES; + if (odata->icq) + args.flags |= AIM_IMFLAGS_OFFLINE; args.features = gaim_features; args.featureslen = sizeof(gaim_features); @@ -2738,6 +2738,7 @@ GList *m = NULL; struct proto_buddy_menu *pbm; char *n = g_strdup(normalize(gc->username)); + struct oscar_data *odata = gc->proto_data; pbm = g_new0(struct proto_buddy_menu, 1); pbm->label = _("Get Info"); @@ -2745,18 +2746,20 @@ pbm->gc = gc; m = g_list_append(m, pbm); - pbm = g_new0(struct proto_buddy_menu, 1); - pbm->label = _("Get Away Msg"); - pbm->callback = oscar_get_away_msg; - pbm->gc = gc; - m = g_list_append(m, pbm); - - if (strcmp(n, normalize(who))) { + if (!odata->icq) { pbm = g_new0(struct proto_buddy_menu, 1); - pbm->label = _("Direct IM"); - pbm->callback = oscar_ask_direct_im; + pbm->label = _("Get Away Msg"); + pbm->callback = oscar_get_away_msg; pbm->gc = gc; m = g_list_append(m, pbm); + + if (strcmp(n, normalize(who))) { + pbm = g_new0(struct proto_buddy_menu, 1); + pbm->label = _("Direct IM"); + pbm->callback = oscar_ask_direct_im; + pbm->gc = gc; + m = g_list_append(m, pbm); + } } g_free(n);