Mercurial > pidgin
comparison src/server.c @ 5436:ad445074d239
[gaim-migrate @ 5818]
Another big commit. Ugh. I need a very smart regexp.
Core/UI split do_error_dialog(), and soon the mail dialogs! Yay! This
should work without problems at all, but standard disclaimer..
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Sun, 18 May 2003 19:59:02 +0000 |
| parents | 2c4188300aba |
| children | 7883082c290a |
comparison
equal
deleted
inserted
replaced
| 5435:a2f26666de42 | 5436:ad445074d239 |
|---|---|
| 35 #include "prpl.h" | 35 #include "prpl.h" |
| 36 #include "multi.h" | 36 #include "multi.h" |
| 37 #include "gaim.h" | 37 #include "gaim.h" |
| 38 #include "sound.h" | 38 #include "sound.h" |
| 39 #include "pounce.h" | 39 #include "pounce.h" |
| 40 #include "notify.h" | |
| 40 | 41 |
| 41 void serv_login(struct gaim_account *account) | 42 void serv_login(struct gaim_account *account) |
| 42 { | 43 { |
| 43 GaimPlugin *p = gaim_find_prpl(account->protocol); | 44 GaimPlugin *p = gaim_find_prpl(account->protocol); |
| 44 GaimPluginProtocolInfo *prpl_info = NULL; | 45 GaimPluginProtocolInfo *prpl_info = NULL; |
| 49 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(p); | 50 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(p); |
| 50 | 51 |
| 51 if (prpl_info->login) { | 52 if (prpl_info->login) { |
| 52 if (!strlen(account->password) && !(prpl_info->options & OPT_PROTO_NO_PASSWORD) && | 53 if (!strlen(account->password) && !(prpl_info->options & OPT_PROTO_NO_PASSWORD) && |
| 53 !(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL)) { | 54 !(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL)) { |
| 54 do_error_dialog(_("Please enter your password"), NULL, GAIM_ERROR); | 55 gaim_notify_error(NULL, NULL, |
| 56 _("Please enter your password"), NULL); | |
| 55 return; | 57 return; |
| 56 } | 58 } |
| 57 | 59 |
| 58 gaim_debug(GAIM_DEBUG_INFO, "server", | 60 gaim_debug(GAIM_DEBUG_INFO, "server", |
| 59 PACKAGE " " VERSION " logging in %s using %s\n", | 61 PACKAGE " " VERSION " logging in %s using %s\n", |
| 1136 _("%s has just been warned by %s.\n" | 1138 _("%s has just been warned by %s.\n" |
| 1137 "Your new warning level is %d%%"), | 1139 "Your new warning level is %d%%"), |
| 1138 gc->username, | 1140 gc->username, |
| 1139 ((name == NULL)? _("an anonymous person") : name), lev); | 1141 ((name == NULL)? _("an anonymous person") : name), lev); |
| 1140 | 1142 |
| 1141 do_error_dialog(buf2, NULL, GAIM_INFO); | 1143 gaim_notify_info(NULL, NULL, buf2, NULL); |
| 1142 } | 1144 } |
| 1143 | 1145 |
| 1144 void serv_got_typing(struct gaim_connection *gc, char *name, int timeout, | 1146 void serv_got_typing(struct gaim_connection *gc, char *name, int timeout, |
| 1145 int state) { | 1147 int state) { |
| 1146 | 1148 |
