Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 20128:57e9d1ecefff
Rename PURPLE_REASON_INVALID_USERNAME to PURPLE_REASON_INVALID_SETTINGS, so it
can be used when a server parameter is required but not supplied (for example).
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Tue, 02 Oct 2007 17:16:16 +0000 |
parents | f24a2cacacd1 |
children | f3cfcbbac3d8 |
comparison
equal
deleted
inserted
replaced
20127:a4fda4159937 | 20128:57e9d1ecefff |
---|---|
586 js->next_id = g_random_int(); | 586 js->next_id = g_random_int(); |
587 js->write_buffer = purple_circ_buffer_new(512); | 587 js->write_buffer = purple_circ_buffer_new(512); |
588 js->old_length = -1; | 588 js->old_length = -1; |
589 | 589 |
590 if(!js->user) { | 590 if(!js->user) { |
591 purple_connection_error_reason (gc, PURPLE_REASON_INVALID_USERNAME, | 591 purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS, |
592 _("Invalid XMPP ID")); | 592 _("Invalid XMPP ID")); |
593 return; | 593 return; |
594 } | 594 } |
595 | 595 |
596 if (!js->user->domain || *(js->user->domain) == '\0') { | 596 if (!js->user->domain || *(js->user->domain) == '\0') { |
597 purple_connection_error_reason (gc, PURPLE_REASON_INVALID_USERNAME, | 597 purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS, |
598 _("Invalid XMPP ID. Domain must be set.")); | 598 _("Invalid XMPP ID. Domain must be set.")); |
599 return; | 599 return; |
600 } | 600 } |
601 | 601 |
602 if(!js->user->resource) { | 602 if(!js->user->resource) { |
1077 js->user = jabber_id_new(purple_account_get_username(account)); | 1077 js->user = jabber_id_new(purple_account_get_username(account)); |
1078 js->next_id = g_random_int(); | 1078 js->next_id = g_random_int(); |
1079 js->old_length = -1; | 1079 js->old_length = -1; |
1080 | 1080 |
1081 if(!js->user) { | 1081 if(!js->user) { |
1082 purple_connection_error_reason (gc, PURPLE_REASON_INVALID_USERNAME, | 1082 purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS, |
1083 _("Invalid XMPP ID")); | 1083 _("Invalid XMPP ID")); |
1084 return; | 1084 return; |
1085 } | 1085 } |
1086 | 1086 |
1087 js->write_buffer = purple_circ_buffer_new(512); | 1087 js->write_buffer = purple_circ_buffer_new(512); |