comparison libpurple/protocols/jabber/jabber.c @ 20187:8c32a904ed1f

applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa through 0411be512ef271d73fb2f800df237b0953a983a1
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 14:52:51 +0000
parents ab38146f8f78
children c1d3d25e8c49 02df6998b466
comparison
equal deleted inserted replaced
20186:c5422ea546dc 20187:8c32a904ed1f
139 { 139 {
140 if(xmlnode_get_child(packet, "starttls")) { 140 if(xmlnode_get_child(packet, "starttls")) {
141 if(jabber_process_starttls(js, packet)) 141 if(jabber_process_starttls(js, packet))
142 return; 142 return;
143 } else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !js->gsc) { 143 } else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !js->gsc) {
144 js->gc->wants_to_die = TRUE;
144 purple_connection_error(js->gc, _("You require encryption, but it is not available on this server.")); 145 purple_connection_error(js->gc, _("You require encryption, but it is not available on this server."));
145 return; 146 return;
146 } 147 }
147 148
148 if(js->registration) { 149 if(js->registration) {