diff src/protocols/msn/switchboard.c @ 10487:659edfcac14e

[gaim-migrate @ 11777] Removed protocol preferences. MSN will display closed conversation messages but not timeouts. Jabber will not display your OS. I left the preferences for OSCAR, but removed them from the UI. OSCAR is complicated because it stores prefs on the server. I'll let Mark figure out a smarter way to handle that. As with all slashed prefs, feel free to voice objections. committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/switchboard.c	Sat Jan 08 18:58:19 2005 +0000
+++ b/src/protocols/msn/switchboard.c	Sat Jan 08 20:30:41 2005 +0000
@@ -626,32 +626,32 @@
 
 		if (cmd->param_count == 2 && atoi(cmd->params[1]) == 1)
 		{
+#if 0
 			if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_timeout_notice"))
 			{
 				str = g_strdup_printf(_("The conversation has become "
 										"inactive and timed out."));
 			}
+#endif
 		}
 		else
 		{
-			if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_close_notice"))
-			{
-				char *username;
-				GaimAccount *account;
-				GaimBuddy *b;
+			char *username;
+			GaimAccount *account;
+			GaimBuddy *b;
 
-				account = cmdproc->session->account;
+			account = cmdproc->session->account;
 
-				if ((b = gaim_find_buddy(account, user)) != NULL)
-					username = gaim_escape_html(gaim_buddy_get_alias(b));
-				else
-					username = gaim_escape_html(user);
+			if ((b = gaim_find_buddy(account, user)) != NULL)
+				username = gaim_escape_html(gaim_buddy_get_alias(b));
+			else
+				username = gaim_escape_html(user);
 
-				str = g_strdup_printf(_("%s has closed the conversation "
-										"window."), username);
-
-				g_free(username);
-			}
+			str = g_strdup_printf(_("%s has closed the conversation "
+						"window."), username);
+		      
+			g_free(username);
+			
 		}
 
 		if (str != NULL)