# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1178668937 0
# Node ID 9195157482535b003cd5216f9f28ccca79e0cb89
# Parent  88444e60ea95eca731f15655e6bbd688a7c466cd
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion

diff -r 88444e60ea95 -r 919515748253 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Tue May 08 22:08:46 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Wed May 09 00:02:17 2007 +0000
@@ -564,7 +564,12 @@
 		purple_connection_error(gc, _("Invalid XMPP ID"));
 		return;
 	}
-
+	
+	if (!js->user->domain || *(js->user->domain) == '\0') {
+		purple_connection_error(gc, _("Invalid XMPP ID. Domain must be set."));
+		return;
+	}
+	
 	if(!js->user->resource) {
 		char *me;
 		js->user->resource = g_strdup("Home");
diff -r 88444e60ea95 -r 919515748253 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Tue May 08 22:08:46 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Wed May 09 00:02:17 2007 +0000
@@ -191,7 +191,8 @@
         PurpleAccountUserSplit *split;
         PurpleAccountOption *option;
 
-        split = purple_account_user_split_new(_("Server"), NULL, '@');
+	/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
+        split = purple_account_user_split_new(_("Domain"), NULL, '@');
         prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
         split = purple_account_user_split_new(_("Resource"), "Home", '/');