Mercurial > pidgin
comparison src/protocols/oscar/family_admin.c @ 13253:87a7c3077c19
[gaim-migrate @ 15619]
More cleaning up of oscar. Renamed some functions to be more clear.
Got rid of some stuff that wasn't used. Inlined some small things
in conn.c that were only used once.
The goals of all this are
1. Non-blocking I/O for all connections
2. p2p stuff won't use the same struct as oscar connections, because
that's stupid
3. The oscar PRPL should be less scary
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 12 Feb 2006 21:27:04 +0000 |
parents | f260d319bbbc |
children | 6519aeb66b31 |
comparison
equal
deleted
inserted
replaced
13252:2871c385c45a | 13253:87a7c3077c19 |
---|---|
40 faim_export int aim_admin_getinfo(OscarSession *sess, OscarConnection *conn, guint16 info) | 40 faim_export int aim_admin_getinfo(OscarSession *sess, OscarConnection *conn, guint16 info) |
41 { | 41 { |
42 FlapFrame *fr; | 42 FlapFrame *fr; |
43 aim_snacid_t snacid; | 43 aim_snacid_t snacid; |
44 | 44 |
45 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 14))) | 45 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 14))) |
46 return -ENOMEM; | 46 return -ENOMEM; |
47 | 47 |
48 snacid = aim_cachesnac(sess, 0x0007, 0x0002, 0x0000, NULL, 0); | 48 snacid = aim_cachesnac(sess, 0x0007, 0x0002, 0x0000, NULL, 0); |
49 aim_putsnac(&fr->data, 0x0007, 0x0002, 0x0000, snacid); | 49 aim_putsnac(&fr->data, 0x0007, 0x0002, 0x0000, snacid); |
50 | 50 |
121 { | 121 { |
122 FlapFrame *fr; | 122 FlapFrame *fr; |
123 aim_snacid_t snacid; | 123 aim_snacid_t snacid; |
124 aim_tlvlist_t *tl = NULL; | 124 aim_tlvlist_t *tl = NULL; |
125 | 125 |
126 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+2+strlen(newnick)))) | 126 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+2+strlen(newnick)))) |
127 return -ENOMEM; | 127 return -ENOMEM; |
128 | 128 |
129 snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0); | 129 snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0); |
130 aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid); | 130 aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid); |
131 | 131 |
148 { | 148 { |
149 FlapFrame *fr; | 149 FlapFrame *fr; |
150 aim_tlvlist_t *tl = NULL; | 150 aim_tlvlist_t *tl = NULL; |
151 aim_snacid_t snacid; | 151 aim_snacid_t snacid; |
152 | 152 |
153 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+4+strlen(curpw)+4+strlen(newpw)))) | 153 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+4+strlen(curpw)+4+strlen(newpw)))) |
154 return -ENOMEM; | 154 return -ENOMEM; |
155 | 155 |
156 snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0); | 156 snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0); |
157 aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid); | 157 aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid); |
158 | 158 |
178 { | 178 { |
179 FlapFrame *fr; | 179 FlapFrame *fr; |
180 aim_snacid_t snacid; | 180 aim_snacid_t snacid; |
181 aim_tlvlist_t *tl = NULL; | 181 aim_tlvlist_t *tl = NULL; |
182 | 182 |
183 if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+2+strlen(newemail)))) | 183 if (!(fr = flap_frame_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+2+strlen(newemail)))) |
184 return -ENOMEM; | 184 return -ENOMEM; |
185 | 185 |
186 snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0); | 186 snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0); |
187 aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid); | 187 aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid); |
188 | 188 |