Remove msn as a profile option

Patch by @denise. I'm just merging it in!

bin/upgrading/deadphrases.dat

@@ -1588,3 +1588,8 @@ general /admin/supportcat/category.tt.field.scope.label
 general /admin/supportcat/category.tt.field.sortorder.label
 general /admin/supportcat/category.tt.field.user_closeable.label
 general /admin/supportcat/category.tt.saved
+
+general widget.search.msn
+general /manage/profile/index.bml.chat.msnusername
+general /profile.bml.im.msn
+general /profile.bml.label.msnusername

bin/upgrading/en.dat

@@ -5124,8 +5124,6 @@ widget.search.interestonly.btn=Find
 
 widget.search.jabber=Jabber ID
 
-widget.search.msn=MSN
-
 widget.search.region=Region
 
 widget.search.siteuser=Site and Account

bin/upgrading/proplists.dat

@@ -622,14 +622,6 @@ userproplist.moderated:
   multihomed: 0
   prettyname: Moderation status
 
-userproplist.msn:
-  cldversion: 0
-  datatype: char
-  des: MSN Username
-  indexed: 1
-  multihomed: 1
-  prettyname: MSN Username
-
 userproplist.newesteventtime:
   cldversion: 4
   datatype: char

cgi-bin/DW/Controller/Search/Multisearch.pm

@@ -213,7 +213,6 @@ sub multisearch_handler {
                      aolim        => $f_im,
                      icq          => $f_im,
                      yahoo        => $f_im,
-                     msn          => $f_im,
                      jabber       => $f_im,
                      region       => $f_region,
                      faq          => $f_faq,

cgi-bin/DW/Logic/ProfilePage.pm

@@ -829,15 +829,6 @@ sub external_services {
         };
     }
 
-    if ( my $msn = $u->prop( 'msn' ) ) {
-        push @ret, {
-            type => 'msn',
-            email => LJ::ehtml( $msn ),
-            image => 'msn.gif',
-            title_ml => '.im.msn',
-        };
-    }
-
     if ( my $pinboard = $u->prop( 'pinboard' ) ) {
         my $pinboard = LJ::eurl( $pinboard );
         push @ret, {

cgi-bin/DW/Worker/ContentImporter/LiveJournal.pm

@@ -502,7 +502,6 @@ sub get_foaf_from {
         'foaf:icqChatID' => 'icq',
         'foaf:aimChatID' => 'aolim',
         'foaf:jabberID' => 'jabber',
-        'foaf:msnChatID' => 'msn',
         'foaf:yahooChatID' => 'yahoo',
         'ya:bio' => 'bio',
         'lj:journaltitle' => 'journaltitle',

cgi-bin/DW/Worker/ContentImporter/Local/Bio.pm

@@ -59,7 +59,7 @@ sub merge_bio_items {
 
     $u->set_bio( $items->{'bio'} ) if defined( $items->{'bio'} );
 
-    foreach my $prop ( qw/ icq aolim jabber msn yahoo journaltitle journalsubtitle / ) {
+    foreach my $prop ( qw/ icq aolim jabber yahoo journaltitle journalsubtitle / ) {
         $u->set_prop( $prop => $items->{$prop} )
             if defined $items->{$prop};
     }

cgi-bin/LJ/Directory/Constraint/ContactInfo.pm

@@ -50,7 +50,7 @@ sub matching_uids {
 
     my @propids;
     # FIRST: check whether we get maches based on IM services
-    foreach my $service (qw(aolim icq yahoo msn jabber skype google_talk)) {
+    foreach my $service (qw(aolim icq yahoo jabber skype google_talk)) {
         my $p = LJ::get_prop("user", $service);
         push @propids, $p->{upropid};
     }

cgi-bin/LJ/Feed.pm

@@ -615,7 +615,7 @@ sub create_view_foaf {
 
     # setup userprops we will need
     $u->preload_props( qw{
-        aolim icq yahoo jabber msn icbm url urlname external_foaf_url country city journaltitle
+        aolim icq yahoo jabber icbm url urlname external_foaf_url country city journaltitle
     } );
 
     # create bare foaf document, for now
@@ -687,7 +687,6 @@ sub create_view_foaf {
         aolim => 'aimChatID',
         icq => 'icqChatID',
         yahoo => 'yahooChatID',
-        msn => 'msnChatID',
         jabber => 'jabberID',
     );
     if ($u->{allow_contactshow} eq 'Y') {

cgi-bin/LJ/vCard.pm

@@ -44,7 +44,7 @@ sub new_remote {
     $vcard->URL($u->journal_base . "/");
 
     $u->preload_props(qw(city state country
-                        aolim google_talk icq jabber msn skype yahoo));
+                        aolim google_talk icq jabber skype yahoo));
 
 
     my $node;
@@ -59,7 +59,7 @@ sub new_remote {
     }
 
     if ($u->share_contactinfo($remote)) {
-        my @chats = qw(aolim google_talk icq jabber msn skype twitter yahoo);
+        my @chats = qw(aolim google_talk icq jabber skype twitter yahoo);
         foreach my $c (@chats) {
             my $field = uc $c;
             $field =~ s/_//g;

htdocs/manage/profile/index.bml

@@ -56,7 +56,7 @@ body<=
     my @uprops = qw/
         opt_whatemailshow comm_theme
         ao3 aolim delicious diigo etsy ffnet google_talk icq jabber
-        last_fm_user msn pinboard pinterest plurk ravelry skype tumblr twitter yahoo
+        last_fm_user pinboard pinterest plurk ravelry skype tumblr twitter yahoo
         url urlname gender
         opt_hidefriendofs opt_hidememberofs
         sidx_bdate sidx_bday
@@ -472,7 +472,6 @@ body<=
                            ["icq", $ML{'.chat.icquin'}, 12],
                            ["jabber", $ML{'.chat.jabber'}, 60],
                            ["last_fm_user", $ML{'.services.last_fm'}, 255],
-                           ["msn", $ML{'.chat.msnusername'}, 60],
                            ["pinboard", $ML{'.services.pinboard'}, 30],
                            ["pinterest", $ML{'.services.pinterest'}, 30],
                            ["plurk", $ML{ '.services.plurk' }, 255],

htdocs/manage/profile/index.bml.text

@@ -7,8 +7,6 @@
 
 .chat.jabber=Jabber
 
-.chat.msnusername=MSN Username
-
 .chat.skype=Skype
 
 .chat.yahooid=Yahoo! ID

htdocs/profile.bml.text

@@ -167,8 +167,6 @@
 
 .im.lastfm=Last.fm
 
-.im.msn=MSN
-
 .im.skype=Skype
 
 .im.skype.status=Skype status
@@ -251,8 +249,6 @@
 
 .label.moredetails=(more details...)
 
-.label.msnusername=MSN Username:
-
 .label.mutual=Mutual Friends:
 
 .label.name=Name: