Remove comment and docstring mentions of MSN

9 files changed, 15 insertions, 17 deletions

diff --git a/libpurple/account.h b/libpurple/account.h
index 6a239be002..67b8e07ed8 100644
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -192,7 +192,7 @@ struct _PurpleAccount
 	/*
 	 * TODO: Supplementing the next two linked lists with hash tables
 	 * should help performance a lot when these lists are long.  This
-	 * matters quite a bit for protocols like MSN, where all your
+	 * matters quite a bit for protocols, where all your
 	 * buddies are added to your permit list.  Currently we have to
 	 * iterate through the entire list if we want to check if someone
 	 * is permitted or denied.  We should do this for 3.0.0.
diff --git a/libpurple/blist.h b/libpurple/blist.h
index a053d081c6..d3cae7a708 100644
--- a/libpurple/blist.h
+++ b/libpurple/blist.h
@@ -139,7 +139,7 @@ struct _PurpleBuddy {
 	PurpleBlistNode node;                     /**< The node that this buddy inherits from */
 	char *name;                             /**< The name of the buddy. */
 	char *alias;                            /**< The user-set alias of the buddy */
-	char *server_alias;                     /**< The server-specified alias of the buddy.  (i.e. MSN "Friendly Names") */
+	char *server_alias;                     /**< The server-specified alias of the buddy */
 	void *proto_data;                       /**< This allows the prpl to associate whatever data it wants with a buddy */
 	PurpleBuddyIcon *icon;                    /**< The buddy icon. */
 	PurpleAccount *account;					/**< the account this buddy belongs to */
diff --git a/libpurple/cmds.h b/libpurple/cmds.h
index c8bba2c4f6..532a917278 100644
--- a/libpurple/cmds.h
+++ b/libpurple/cmds.h
@@ -170,7 +170,7 @@ extern "C" {
  *          order for the command to ever actually be called.
  * @param prpl_id If the #PURPLE_CMD_FLAG_PRPL_ONLY flag is set, this is the id
  *                of the prpl to which the command applies (such as
- *                <tt>"prpl-msn"</tt>). If the flag is not set, this parameter
+ *                <tt>"prpl-aim"</tt>). If the flag is not set, this parameter
  *                is ignored; pass @c NULL (or a humourous string of your
  *                choice!).
  * @param func This is the function to call when someone enters this command.
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
index 051ab481b5..8a39b600d4 100644
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -351,7 +351,7 @@ purple_conversation_new(PurpleConversationType type, PurpleAccount *account,
 		}
 
 		/*
-		 * This hack is necessary because some prpls (MSN) have unnamed chats
+		 * This hack is necessary because some prpls have unnamed chats
 		 * that all use the same name.  A PurpleConversation for one of those
 		 * is only ever re-used if the user has left, so calls to
 		 * purple_conversation_new need to fall-through to creating a new
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
index e01dc19145..af2efdf20d 100644
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -884,9 +884,8 @@ guint purple_conv_im_get_typing_timeout(const PurpleConvIm *im);
 
 /**
  * Sets the quiet-time when no PURPLE_TYPING messages will be sent.
- * Few protocols need this (maybe only MSN).  If the user is still
- * typing after this quiet-period, then another PURPLE_TYPING message
- * will be sent.
+ * Few protocols need this.  If the user is still typing after this
+ * quiet-period, then another PURPLE_TYPING message will be sent.
  *
  * @param im  The IM.
  * @param val The number of seconds to wait before allowing another
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index f34052b6e4..3cd86c0a39 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -315,8 +315,9 @@ init_plugin(PurplePlugin *plugin)
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						  option);
 
-	/* this should probably be part of global smiley theme settings later on,
-	  shared with MSN */
+	/* this should probably be part of global smiley theme settings
+	 * later on
+	 */
 	option = purple_account_option_bool_new(_("Show Custom Smileys"),
 		"custom_smileys", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index 1f8888fa87..9584aa370e 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -162,7 +162,7 @@ typedef enum
 	/**
 	 * Notify on new mail.
 	 *
-	 * MSN and Yahoo notify you when you have new mail.
+	 * Yahoo notifies you when you have new mail.
 	 */
 	OPT_PROTO_MAIL_CHECK = 0x00000020,
 
@@ -922,7 +922,7 @@ GList *purple_prpl_get_statuses(PurpleAccount *account, PurplePresence *presence
  * @param who Whose attention to request.
  * @param type_code An index into the prpl's attention_types list determining the type
  *        of the attention request command to send. 0 if prpl only defines one
- *        (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
+ *        (for example, Yahoo), but some protocols define more (MySpaceIM).
  *
  * Note that you can't send arbitrary PurpleAttentionType's, because there is
  * only a fixed set of attention commands.
diff --git a/libpurple/server.h b/libpurple/server.h
index 504011561b..f2c5134624 100644
--- a/libpurple/server.h
+++ b/libpurple/server.h
@@ -69,7 +69,7 @@ PurpleAttentionType *purple_get_attention_type_from_code(PurpleAccount *account,
  * @param who Whose attention to request.
  * @param type_code An index into the prpl's attention_types list determining the type
  * 	of the attention request command to send. 0 if prpl only defines one
- * 	(for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
+ * 	(for example, Yahoo), but some protocols define more (MySpaceIM).
  *
  * Note that you can't send arbitrary PurpleAttentionType's, because there is
  * only a fixed set of attention commands.
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index dff3b427bd..71fdc4bf05 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -3791,7 +3791,7 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 
 		/* Nickname/Server Alias */
 		/* I'd like to only show this if there's a contact or buddy
-		 * alias, but many people on MSN set long nicknames, which
+		 * alias, but people often set long nicknames, which
 		 * get ellipsized, so the only way to see the whole thing is
 		 * to look at the tooltip. */
 		if (full && b->server_alias != NULL && b->server_alias[0] != '\0')
@@ -4017,14 +4017,12 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 
 	tune = purple_presence_get_status(p, "tune");
 	if (tune && purple_status_is_active(tune)) {
-		/* Only in MSN.
-		 * TODO: Replace "Tune" with generalized "Media" in 3.0. */
+		/* TODO: Replace "Tune" with generalized "Media" in 3.0. */
 		if (purple_status_get_attr_string(tune, "game") != NULL) {
 			path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "game.png", NULL);
 			return _pidgin_blist_get_cached_emblem(path);
 		}
-		/* Only in MSN.
-		 * TODO: Replace "Tune" with generalized "Media" in 3.0. */
+		/* TODO: Replace "Tune" with generalized "Media" in 3.0. */
 		if (purple_status_get_attr_string(tune, "office") != NULL) {
 			path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "office.png", NULL);
 			return _pidgin_blist_get_cached_emblem(path);