[Gaim-commits] CVS: gaim/src/protocols/msn servconn.c,1.33,1.34

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21425

Modified Files:
	servconn.c 
Log Message:
If we get an error in a switchboard, don't disconnect. Instead, display the
error and keep our connection alive.


Index: servconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/servconn.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -p -r1.33 -r1.34
--- servconn.c	27 Apr 2004 02:42:01 -0000	1.33
+++ servconn.c	27 May 2004 06:34:38 -0000	1.34
@@ -200,7 +200,7 @@ show_error(MsnServConn *servconn)
 
 	const char *names[] = { "Notification", "Switchboard" };
 	const char *name;
-	
+
 	gc = gaim_account_get_connection(servconn->session->account);
 	name = names[servconn->type];
 
@@ -223,8 +223,11 @@ show_error(MsnServConn *servconn)
 			break;
 	}
 
-	gaim_connection_error(gc, tmp);
-	
+	if (servconn->type != MSN_SERVER_SB)
+		gaim_connection_error(gc, tmp);
+	else
+		gaim_notify_error(gc, NULL, tmp, NULL);
+
 	g_free(tmp);
 }