Get rid of ICQ and Yahoo iconsets

Author: Ri0n

admin/update_iconsets.sh

@@ -5,7 +5,7 @@ TARGET_DIR=../iconsets
 
 ROSTER_DEFAULT='crystal-roster'
 ROSTER_EXTRAS='
-    crystal-icq crystal-service crystal-yahoo
+    crystal-service
     crystal-gadu crystal-sms crystal-roster
     '
 

iconsets/roster/crystal-icq.jisp

@@ -13,10 +13,6 @@
           <iconset type="QString">crystal-gadu.jisp</iconset>
           <key type="QString">gadugadu</key>
         </m0>
-        <m1>
-          <iconset type="QString">crystal-icq.jisp</iconset>
-          <key type="QString">icq</key>
-        </m1>
         <m2>
           <iconset type="QString">crystal-sms.jisp</iconset>
           <key type="QString">sms</key>
@@ -25,10 +21,6 @@
           <iconset type="QString">crystal-service.jisp</iconset>
           <key type="QString">transport</key>
         </m3>
-        <m4>
-          <iconset type="QString">crystal-yahoo.jisp</iconset>
-          <key type="QString">yahoo</key>
-        </m4>
       </service-status>
     </iconsets>
     <status>

iconsets/roster/crystal-yahoo.jisp

@@ -535,10 +535,6 @@
           <iconset type="QString">crystal-gadu.jisp</iconset>
           <key type="QString">gadugadu</key>
         </m0>
-        <m1>
-          <iconset type="QString">crystal-icq.jisp</iconset>
-          <key type="QString">icq</key>
-        </m1>
         <m2>
           <iconset type="QString">crystal-sms.jisp</iconset>
           <key type="QString">sms</key>
@@ -547,10 +543,6 @@
           <iconset type="QString">crystal-service.jisp</iconset>
           <key type="QString">transport</key>
         </m3>
-        <m4>
-          <iconset type="QString">crystal-yahoo.jisp</iconset>
-          <key type="QString">yahoo</key>
-        </m4>
    </service-status>
    <custom-status/>
    <status type="QString">default</status>

options/newprofile.xml

@@ -287,10 +287,8 @@ void AddUserDlg::errorGateway(const QString &str, const QString &err)
                                 "to add.  Examples:<br>"
                                 "<br>"
                                 "&nbsp;&nbsp;[email protected]<br>"
-                                "&nbsp;&nbsp;aolUser@[XMPP address of AIM Transport]<br>"
-                                "&nbsp;&nbsp;1234567@[XMPP address of ICQ Transport]<br>"
-                                "&nbsp;&nbsp;joe%hotmail.com@[XMPP address of MSN Transport]<br>"
-                                "&nbsp;&nbsp;yahooUser@[XMPP address of Yahoo Transport]<br>"
+                                "&nbsp;&nbsp;1234567@[XMPP address of Transport]<br>"
+                                "&nbsp;&nbsp;joe%gmail.com@[XMPP address of Transport]<br>"
                                 "</qt>")
                                  .arg(str, QString(err).replace('\n', "<br>")));
 }

qa/integration/psi-data/profiles/default/options.xml

@@ -1275,22 +1275,20 @@ QWidget *OptionsTabIconsetRoster::widget()
     IconsetRosterUI *d = static_cast<IconsetRosterUI *>(w);
 
     // Initialize transport iconsets
-    addService("aim", "AIM");
     addService("muc", "Chat (MUC)");
     addService("gadugadu", "Gadu-Gadu");
-    addService("icq", "ICQ");
+    addService("telegram", "Telegram");
     addService("irc", "IRC");
+    addService("xmpp", "XMPP");
     addService("disk", "Jabber Disk");
     addService("mrim", "Mail.Ru-IM");
-    addService("msn", "MSN");
+    addService("skype", "Skype");
     addService("rss", "RSS");
     addService("sms", "SMS");
     addService("smtp", "SMTP");
     addService("transport", tr("Transport"));
     addService("vkontakte", tr("vk.com"));
     addService("weather", tr("Weather"));
-    addService("xmpp", "XMPP");
-    addService("yahoo", "Yahoo!");
 
     d->tw_isServices->resizeColumnToContents(0);
 

src/adduserdlg.cpp

@@ -595,22 +595,20 @@ void PsiIconset::loadStatusIconDefinitions()
         QString                                          service = serviceV.toString();
         PsiIconset::Private::StatusIconsets::IconsetItem item;
         bool                                             find = true;
-        if (service == "aim")
-            item.regexp = QRegExp("^aim");
-        else if (service == "disk")
+        if (service == "disk")
             item.regexp = QRegExp("^disk");
         else if (service == "gadugadu")
             item.regexp = QRegExp("^gg");
-        else if (service == "icq")
-            item.regexp = QRegExp("^icq|^jit");
+        else if (service == "telegram")
+            item.regexp = QRegExp("^telegram");
         else if (service == "irc")
             item.regexp = QRegExp("^irc");
         else if (service == "xmpp")
             item.regexp = QRegExp("^j2j|^xmpp\\.[a-z1-9]+\\..*");
         else if (service == "mrim")
             item.regexp = QRegExp("^mrim");
-        else if (service == "msn")
-            item.regexp = QRegExp("^msn");
+        else if (service == "skype")
+            item.regexp = QRegExp("^skype");
         else if (service == "muc")
             item.regexp = QRegExp("^conference|^rooms");
         else if (service == "rss")
@@ -623,8 +621,6 @@ void PsiIconset::loadStatusIconDefinitions()
             item.regexp = QRegExp("^vk.com|^vkontakte|^vk-t");
         else if (service == "weather")
             item.regexp = QRegExp("^weather|^gism");
-        else if (service == "yahoo")
-            item.regexp = QRegExp("^yahoo");
         else
             find = false;