Mercurial > pidgin.yaz

comparison libpurple/protocols/simple/simple.c @ 21000:89c7be36fd61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.2.2.2' (head 0adab134b7a42e144aee3ac60d825db1f28a42a4) to branch 'im.pidgin.pidgin' (head 4e59fcb1e2baf2eb63083224381e0af9fe1331cc)
author Richard Laager <rlaager@wiktel.com>
date Tue, 23 Oct 2007 17:27:12 +0000
parents 07c2e60026da 74ec24deb267
children 61a87e02da29
comparison
equal deleted inserted replaced
20374:535de68c9d09 21000:89c7be36fd61
694 } 694 }
695 695
696 static void do_register_exp(struct simple_account_data *sip, int expire) { 696 static void do_register_exp(struct simple_account_data *sip, int expire) {
697 char *uri, *to, *contact, *hdr; 697 char *uri, *to, *contact, *hdr;
698 698
699 /* Set our default expiration to 900, 699 /* Set our default expiration to 900,
700 * as done in the initialization of the simple_account_data 700 * as done in the initialization of the simple_account_data
701 * structure. 701 * structure.
702 */ 702 */
703 if (!expire) 703 if (!expire)
704 expire = 900; 704 expire = 900;
1041 if(sip->registerstatus != SIMPLE_REGISTER_RETRY) { 1041 if(sip->registerstatus != SIMPLE_REGISTER_RETRY) {
1042 purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries); 1042 purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
1043 if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) { 1043 if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
1044 purple_debug_info("simple", "Setting wants_to_die to true.\n"); 1044 purple_debug_info("simple", "Setting wants_to_die to true.\n");
1045 sip->gc->wants_to_die = TRUE; 1045 sip->gc->wants_to_die = TRUE;
1046 if (!purple_account_get_remember_password(sip->gc->account))
1047 purple_account_set_password(sip->gc->account, NULL);
1046 purple_connection_error(sip->gc, _("Incorrect password.")); 1048 purple_connection_error(sip->gc, _("Incorrect password."));
1047 return TRUE; 1049 return TRUE;
1048 } 1050 }
1049 tmp = sipmsg_find_header(msg, "WWW-Authenticate"); 1051 tmp = sipmsg_find_header(msg, "WWW-Authenticate");
1050 fill_auth(sip, tmp, &sip->registrar); 1052 fill_auth(sip, tmp, &sip->registrar);