Mercurial > pidgin.yaz

comparison libpurple/protocols/oscar/oscar.c @ 20228:0bf3907e62fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied changes from 813313930984d57208e5079d304d5a7c21c6b848 through 02a707bbb0cf1cab4c65c4977bed39c67c5b2452
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 15:50:22 +0000
parents b199a9be3e95
children e01a6dc25900
comparison
equal deleted inserted replaced
20227:5a352cb00fc3 20228:0bf3907e62fd
2 * purple 2 * purple
3 * 3 *
4 * Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net> 4 * Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
5 * Some code copyright (C) 1999-2001, Eric Warmenhoven 5 * Some code copyright (C) 1999-2001, Eric Warmenhoven
6 * Some code copyright (C) 2001-2003, Sean Egan 6 * Some code copyright (C) 2001-2003, Sean Egan
7 * Some code copyright (C) 2001-2005, Mark Doliner <thekingant@users.sourceforge.net> 7 * Some code copyright (C) 2001-2007, Mark Doliner <thekingant@users.sourceforge.net>
8 * Some code copyright (C) 2005, Jonathan Clark <ardentlygnarly@users.sourceforge.net> 8 * Some code copyright (C) 2005, Jonathan Clark <ardentlygnarly@users.sourceforge.net>
9 * Some code copyright (C) 2007, ComBOTS Product GmbH (htfv) <foss@combots.com>
9 * 10 *
10 * Most libfaim code copyright (C) 1998-2001 Adam Fritzler <afritz@auk.cx> 11 * Most libfaim code copyright (C) 1998-2001 Adam Fritzler <afritz@auk.cx>
11 * Some libfaim code copyright (C) 2001-2004 Mark Doliner <thekingant@users.sourceforge.net> 12 * Some libfaim code copyright (C) 2001-2004 Mark Doliner <thekingant@users.sourceforge.net>
12 * 13 *
13 * This program is free software; you can redistribute it and/or modify 14 * This program is free software; you can redistribute it and/or modify
1630 static int 1631 static int
1631 purple_parse_login(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) 1632 purple_parse_login(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
1632 { 1633 {
1633 PurpleConnection *gc; 1634 PurpleConnection *gc;
1634 PurpleAccount *account; 1635 PurpleAccount *account;
1635 ClientInfo info = CLIENTINFO_PURPLE; 1636 ClientInfo aiminfo = CLIENTINFO_PURPLE_AIM;
1637 ClientInfo icqinfo = CLIENTINFO_PURPLE_ICQ;
1636 va_list ap; 1638 va_list ap;
1637 char *key; 1639 char *key;
1638 gboolean truncate_pass; 1640 gboolean truncate_pass;
1639 1641
1640 gc = od->gc; 1642 gc = od->gc;
1645 truncate_pass = va_arg(ap, int); 1647 truncate_pass = va_arg(ap, int);
1646 va_end(ap); 1648 va_end(ap);
1647 1649
1648 aim_send_login(od, conn, purple_account_get_username(account), 1650 aim_send_login(od, conn, purple_account_get_username(account),
1649 purple_connection_get_password(gc), truncate_pass, 1651 purple_connection_get_password(gc), truncate_pass,
1650 &info, key); 1652 od->icq ? &icqinfo : &aiminfo, key);
1651 1653
1652 purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS); 1654 purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS);
1653 ck[2] = 0x6c; 1655 ck[2] = 0x6c;
1654 1656
1655 return 1; 1657 return 1;