comparison src/protocols/icq/gaim_icq.c @ 6106:99f4bbeb27bc

[gaim-migrate @ 6567] Fix Cae non-fatal bug 6: "no notification of incorrect password/name." Also removed some unused code from gtkconn.c and multi.c (which was derelict). Make dialog and request windows show the titles that are passed to them. Fixed a compiler warning coughsean'sawaymessagestuffcough I'm looking forward to writting a NEWS entry for 0.65, I hope it will be soon :-) committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 13 Jul 2003 09:34:48 +0000
parents fefad67de2c7
children 156e6643f9db
comparison
equal deleted inserted replaced
6105:786adff640e1 6106:99f4bbeb27bc
82 static void icq_logged_off(icq_Link *link) { 82 static void icq_logged_off(icq_Link *link) {
83 struct gaim_connection *gc = link->icq_UserData; 83 struct gaim_connection *gc = link->icq_UserData;
84 struct icq_data *id = (struct icq_data *)gc->proto_data; 84 struct icq_data *id = (struct icq_data *)gc->proto_data;
85 85
86 if (!id->connected) { 86 if (!id->connected) {
87 hide_login_progress(gc, "Unable to connect"); 87 gaim_connection_error(gc, "Unable to connect");
88 signoff(gc); 88 signoff(gc);
89 return; 89 return;
90 } 90 }
91 91
92 if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) { 92 if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) {
93 hide_login_progress(gc, "Unable to connect"); 93 gaim_connection_error(gc, "Unable to connect");
94 signoff(gc); 94 signoff(gc);
95 return; 95 return;
96 } 96 }
97 97
98 icq_Login(link, id->cur_status); 98 icq_Login(link, id->cur_status);
164 g_free(msg); 164 g_free(msg);
165 } 165 }
166 166
167 static void icq_wrong_passwd(icq_Link *link) { 167 static void icq_wrong_passwd(icq_Link *link) {
168 struct gaim_connection *gc = link->icq_UserData; 168 struct gaim_connection *gc = link->icq_UserData;
169 hide_login_progress(gc, "Invalid password."); 169 gaim_connection_error(gc, "Invalid password.");
170 signoff(gc); 170 signoff(gc);
171 } 171 }
172 172
173 static void icq_invalid_uin(icq_Link *link) { 173 static void icq_invalid_uin(icq_Link *link) {
174 struct gaim_connection *gc = link->icq_UserData; 174 struct gaim_connection *gc = link->icq_UserData;
175 hide_login_progress(gc, "Invalid UIN."); 175 gaim_connection_error(gc, "Invalid UIN.");
176 signoff(gc); 176 signoff(gc);
177 } 177 }
178 178
179 static void icq_info_reply(icq_Link *link, unsigned long uin, const char *nick, 179 static void icq_info_reply(icq_Link *link, unsigned long uin, const char *nick,
180 const char *first, const char *last, const char *email, char auth) { 180 const char *first, const char *last, const char *email, char auth) {
339 icq_SetProxy(link, gpi->proxyhost, gpi->proxyport, gpi->proxyuser[0], gpi->proxyuser, gpi->proxypass); 339 icq_SetProxy(link, gpi->proxyhost, gpi->proxyport, gpi->proxyuser[0], gpi->proxyuser, gpi->proxypass);
340 340
341 icq_ContactClear(id->link); 341 icq_ContactClear(id->link);
342 342
343 if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) { 343 if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) {
344 hide_login_progress(gc, _("Unable to connect")); 344 gaim_connection_error(gc, _("Unable to connect"));
345 signoff(gc); 345 signoff(gc);
346 return; 346 return;
347 } 347 }
348 348
349 id->cur_status = STATUS_ONLINE; 349 id->cur_status = STATUS_ONLINE;
350 icq_Login(link, STATUS_ONLINE); 350 icq_Login(link, STATUS_ONLINE);
351 351
352 set_login_progress(gc, 0, _("Connecting...")); 352 gaim_connection_update_progress(gc, _("Connecting..."), 0, 2);
353 } 353 }
354 354
355 static void icq_close(struct gaim_connection *gc) { 355 static void icq_close(struct gaim_connection *gc) {
356 struct icq_data *id = (struct icq_data *)gc->proto_data; 356 struct icq_data *id = (struct icq_data *)gc->proto_data;
357 357