im.pidgin.pidgin: ac16fdafec7ed991286972ee834ad660e84f4ba6
evands at pidgin.im
evands at pidgin.im
Mon Nov 19 03:13:31 EST 2007
-----------------------------------------------------------------
Revision: ac16fdafec7ed991286972ee834ad660e84f4ba6
Ancestor: 76c07fcb434a2a7aa289734bb221c171a376d73b
Author: evands at pidgin.im
Date: 2007-11-19T06:15:15
Branch: im.pidgin.pidgin
Modified files:
libpurple/protocols/jabber/jabber.c
ChangeLog:
Fixed whitespace and indentation in jabber_register_parse(). I'm seeing crashes while attempting to register, and it was difficult to follow the previous code with inconsistent and misleading indentation.
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c 3c8f142ec3ccf4372b86d5801b8c50af156953d1
+++ libpurple/protocols/jabber/jabber.c a7a36386fbb8f5a51575612a83caf2fc50b6c878
@@ -840,149 +840,135 @@ void jabber_register_parse(JabberStream
PurpleAccount *account = purple_connection_get_account(js->gc);
const char *type;
const char *from = xmlnode_get_attrib(packet, "from");
- PurpleRequestFields *fields;
- PurpleRequestFieldGroup *group;
- PurpleRequestField *field;
- xmlnode *query, *x, *y;
- char *instructions;
+ PurpleRequestFields *fields;
+ PurpleRequestFieldGroup *group;
+ PurpleRequestField *field;
+ xmlnode *query, *x, *y;
+ char *instructions;
JabberRegisterCBData *cbdata;
gboolean registered = FALSE;
if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result"))
return;
- if(js->registration)
+ if(js->registration) {
/* get rid of the login thingy */
purple_connection_set_state(js->gc, PURPLE_CONNECTED);
+ }
- query = xmlnode_get_child(packet, "query");
+ query = xmlnode_get_child(packet, "query");
- if(xmlnode_get_child(query, "registered")) {
+ if(xmlnode_get_child(query, "registered")) {
registered = TRUE;
-
+
if(js->registration) {
purple_notify_error(NULL, _("Already Registered"),
- _("Already Registered"), NULL);
+ _("Already Registered"), NULL);
if(account->registration_cb)
(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
jabber_connection_schedule_close(js);
return;
}
}
-
- if((x = xmlnode_get_child_with_namespace(packet, "x",
- "jabber:x:data"))) {
+
+ if((x = xmlnode_get_child_with_namespace(packet, "x", "jabber:x:data"))) {
jabber_x_data_request(js, x, jabber_register_x_data_cb, g_strdup(from));
- return;
- } else if((x = xmlnode_get_child_with_namespace(packet, "x",
- "jabber:x:oob"))) {
- xmlnode *url;
+ return;
- if((url = xmlnode_get_child(x, "url"))) {
- char *href;
- if((href = xmlnode_get_data(url))) {
- purple_notify_uri(NULL, href);
- g_free(href);
- if(js->registration) {
- js->gc->wants_to_die = TRUE;
- if(account->registration_cb) /* succeeded, but we have no login info */
- (account->registration_cb)(account, TRUE, account->registration_cb_user_data);
- jabber_connection_schedule_close(js);
- }
- return;
+ } else if((x = xmlnode_get_child_with_namespace(packet, "x", "jabber:x:oob"))) {
+ xmlnode *url;
+
+ if((url = xmlnode_get_child(x, "url"))) {
+ char *href;
+ if((href = xmlnode_get_data(url))) {
+ purple_notify_uri(NULL, href);
+ g_free(href);
+
+ if(js->registration) {
+ js->gc->wants_to_die = TRUE;
+ if(account->registration_cb) /* succeeded, but we have no login info */
+ (account->registration_cb)(account, TRUE, account->registration_cb_user_data);
+ jabber_connection_schedule_close(js);
}
+ return;
}
}
+ }
- /* as a last resort, use the old jabber:iq:register syntax */
+ /* as a last resort, use the old jabber:iq:register syntax */
- fields = purple_request_fields_new();
- group = purple_request_field_group_new(NULL);
- purple_request_fields_add_group(fields, group);
+ fields = purple_request_fields_new();
+ group = purple_request_field_group_new(NULL);
+ purple_request_fields_add_group(fields, group);
if(js->registration)
- field = purple_request_field_string_new("username", _("Username"),
- js->user->node, FALSE);
+ field = purple_request_field_string_new("username", _("Username"), js->user->node, FALSE);
else
- field = purple_request_field_string_new("username", _("Username"),
- NULL, FALSE);
+ field = purple_request_field_string_new("username", _("Username"), NULL, FALSE);
- purple_request_field_group_add_field(group, field);
+ purple_request_field_group_add_field(group, field);
if(js->registration)
field = purple_request_field_string_new("password", _("Password"),
- purple_connection_get_password(js->gc), FALSE);
+ purple_connection_get_password(js->gc), FALSE);
else
- field = purple_request_field_string_new("password", _("Password"),
- NULL, FALSE);
+ field = purple_request_field_string_new("password", _("Password"), NULL, FALSE);
- purple_request_field_string_set_masked(field, TRUE);
- purple_request_field_group_add_field(group, field);
+ purple_request_field_string_set_masked(field, TRUE);
+ purple_request_field_group_add_field(group, field);
- if(xmlnode_get_child(query, "name")) {
+ if(xmlnode_get_child(query, "name")) {
if(js->registration)
field = purple_request_field_string_new("name", _("Name"),
- purple_account_get_alias(js->gc->account), FALSE);
+ purple_account_get_alias(js->gc->account), FALSE);
else
- field = purple_request_field_string_new("name", _("Name"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "email")) {
- field = purple_request_field_string_new("email", _("E-mail"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "nick")) {
- field = purple_request_field_string_new("nick", _("Nickname"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "first")) {
- field = purple_request_field_string_new("first", _("First name"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "last")) {
- field = purple_request_field_string_new("last", _("Last name"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "address")) {
- field = purple_request_field_string_new("address", _("Address"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "city")) {
- field = purple_request_field_string_new("city", _("City"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "state")) {
- field = purple_request_field_string_new("state", _("State"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "zip")) {
- field = purple_request_field_string_new("zip", _("Postal code"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "phone")) {
- field = purple_request_field_string_new("phone", _("Phone"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "url")) {
- field = purple_request_field_string_new("url", _("URL"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
- if(xmlnode_get_child(query, "date")) {
- field = purple_request_field_string_new("date", _("Date"),
- NULL, FALSE);
- purple_request_field_group_add_field(group, field);
- }
+ field = purple_request_field_string_new("name", _("Name"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "email")) {
+ field = purple_request_field_string_new("email", _("E-mail"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "nick")) {
+ field = purple_request_field_string_new("nick", _("Nickname"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "first")) {
+ field = purple_request_field_string_new("first", _("First name"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "last")) {
+ field = purple_request_field_string_new("last", _("Last name"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "address")) {
+ field = purple_request_field_string_new("address", _("Address"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "city")) {
+ field = purple_request_field_string_new("city", _("City"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "state")) {
+ field = purple_request_field_string_new("state", _("State"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "zip")) {
+ field = purple_request_field_string_new("zip", _("Postal code"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "phone")) {
+ field = purple_request_field_string_new("phone", _("Phone"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "url")) {
+ field = purple_request_field_string_new("url", _("URL"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
+ if(xmlnode_get_child(query, "date")) {
+ field = purple_request_field_string_new("date", _("Date"), NULL, FALSE);
+ purple_request_field_group_add_field(group, field);
+ }
if(registered) {
field = purple_request_field_bool_new("unregister", _("Unregister"), FALSE);
purple_request_field_group_add_field(group, field);
@@ -1013,7 +999,7 @@ void jabber_register_parse(JabberStream
:g_strdup_printf(_("Register New Account at %s"), from);
purple_request_fields_with_hint(js->gc, title,
title, instructions, fields,
- registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb),
+ (registered ? _("Change Registration") : _("Register")), G_CALLBACK(jabber_register_cb),
_("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
purple_connection_get_account(js->gc), NULL, NULL,
PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
More information about the Commits
mailing list