[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.88,1.89

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv7426/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- msn.c	5 Aug 2002 07:44:11 -0000	1.88
+++ msn.c	25 Aug 2002 10:51:23 -0000	1.89
@@ -348,7 +348,7 @@
 	}
 
 	if (show)
-		do_error_dialog(msg, _("MSN Error"));
+		do_error_dialog(msg, NULL, GAIM_ERROR);
 
 	return msg;
 }
@@ -555,7 +555,7 @@
 		ms->msguser = g_strdup(user);
 		ms->msglen = length;
 	} else if (!g_strncasecmp(buf, "NAK", 3)) {
-		do_error_dialog(_("A message may not have been received."), _("MSN Error"));
+		do_error_dialog(_("An MSN message may not have been received."), NULL, GAIM_ERROR);
 	} else if (!g_strncasecmp(buf, "NLN", 3)) {
 	} else if (!g_strncasecmp(buf, "OUT", 3)) {
 		if (ms->chat)
@@ -812,7 +812,9 @@
 		close(source);
 		if (g_slist_find(connections, gc)) {
 			msn_kill_switch(ms);
-			do_error_dialog(_("MSN Error"), _("Gaim was unable to send a message"));
+			do_error_dialog(_("Gaim was unable to send an MSN message"),
+					_("Gaim encountered an error communicating with the "
+					  "MSN switchboard server.  Please try again later."), GAIM_ERROR);
 		}
 		return;
 	}
@@ -2113,7 +2115,7 @@
 	alias = str_to_utf8(url_encode(entry));
 	
 	if (strlen(alias) >= BUDDY_ALIAS_MAXLEN) {
-		do_error_dialog(_("Friendly name too long."), _("MSN Error"));
+		do_error_dialog(_("New MSN friendly name too long."), NULL, GAIM_ERROR);
 		return;
 	}
 	
@@ -2282,7 +2284,11 @@
 	char *dupl;
 
 	if (!strchr(who, '@')) {
-		do_error_dialog(_("Invalid name"), _("MSN Error"));
+		g_snprintf(buf, sizeof(buf), 
+			   _("An MSN screenname must be in the form \"us...@se...\".  "
+			     "Perhaps you meant %s...@ho....  No changes were made to your "
+			     "allow list."), who);
+		do_error_dialog(_("Invalid MSN screenname"), buf, GAIM_ERROR);
 		gc->permit = g_slist_remove(gc->permit, who);
 		g_free(who);
 		return;
@@ -2335,7 +2341,11 @@
 	char *dupl;
 	
 	if (!strchr(who, '@')) {
-		do_error_dialog(_("Invalid name"), _("MSN Error"));
+		g_snprintf(buf, sizeof(buf), 
+			   _("An MSN screenname must be in the form \"us...@se...\".  "
+			     "Perhaps you meant %s...@ho....  No changes were made to your "
+			     "block list."), who);
+		do_error_dialog(_("Invalid MSN screenname"), buf, GAIM_ERROR);
 		gc->deny = g_slist_remove(gc->deny, who);
 		g_free(who);
 		return;