Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:belphegor_belbel:KDE3
kdenetwork3
kdenetwork3-kopete-trinity-remove-aim.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kdenetwork3-kopete-trinity-remove-aim.patch of Package kdenetwork3
diff -Naru kdenetwork-3.5.10_orig/doc/kopete/index.docbook kdenetwork-3.5.10/doc/kopete/index.docbook --- kdenetwork-3.5.10_orig/doc/kopete/index.docbook 2007-01-15 11:23:55.000000000 +0000 +++ kdenetwork-3.5.10/doc/kopete/index.docbook 2018-04-26 08:59:43.712640138 +0000 @@ -108,7 +108,6 @@ <keyword>IRC</keyword> <keyword>MSN</keyword> <keyword>ICQ</keyword> -<keyword>AIM</keyword> <keyword>Yahoo</keyword> <keyword>Gadu-Gadu</keyword> <keyword>GroupWise</keyword> @@ -691,10 +690,6 @@ <para>&kopete; calls different &im; systems 'Protocols'. When you add an account, it is specific to a single protocol. Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para> <sect1 id="protocols-list"> <title>Protocols</title> - <sect2 id="protocols-aim"> - <title>AIM</title> - <para>AIM supports chatrooms. Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para> - </sect2> <sect2 id="protocols-icq"> <title>ICQ</title> <para>ICQ has an Invisibility feature which allows you to hide from selected contacts. You may also search the ICQ user directory when adding a contact. A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para> @@ -901,7 +896,7 @@ <question><para>I need to connect via a SOCKS proxy, but I can't find any proxy configuration options in &kopete;. How do I set up &kopete; to use SOCKS?</para> </question> <answer><itemizedlist> -<listitem><para><trademark>MSN</trademark>, <trademark>ICQ</trademark>, <trademark>AIM</trademark>, Jabber, and <trademark>Yahoo</trademark> use the &kde; network infrastructure. Their SOCKS proxy details are configured with the rest of &kde;, in <application>Control Center</application>, <menuchoice><guimenu>Internet & Network</guimenu><guimenuitem>Proxy</guimenuitem></menuchoice>.</para></listitem> +<listitem><para><trademark>MSN</trademark>, <trademark>ICQ</trademark>, Jabber, and <trademark>Yahoo</trademark> use the &kde; network infrastructure. Their SOCKS proxy details are configured with the rest of &kde;, in <application>Control Center</application>, <menuchoice><guimenu>Internet & Network</guimenu><guimenuitem>Proxy</guimenuitem></menuchoice>.</para></listitem> </itemizedlist> </answer> </qandaentry> diff -Naru kdenetwork-3.5.10_orig/kopete/TODO kdenetwork-3.5.10/kopete/TODO --- kdenetwork-3.5.10_orig/kopete/TODO 2005-09-10 08:20:28.000000000 +0000 +++ kdenetwork-3.5.10/kopete/TODO 2018-04-26 09:00:16.500239050 +0000 @@ -32,7 +32,7 @@ ================================================================================ -OSCAR ICQ/AIM TODO ITEMS +OSCAR ICQ TODO ITEMS OSCAR in general======================================================== - somehow sync server and local list, this is not as trivial as everybody @@ -48,7 +48,6 @@ (should work if kopete groupname == serverside groupname) X Base Buffer class on something like QDataStream (if possible), I don't like all the pointer stuff in here - X get rid of AIMContactList, AIMBuddy (almost gone already) and AIMGroup. ICQ specific =========================================================== X support simple icq type-2 messages so we can send/receive away @@ -70,10 +69,6 @@ - support sending all of your own icq userinfo to the server, it's easy to do but a lot of of boring work - AIM specific =========================================================== - - Nothing in here yet, I'd appreciate somebody with more extensive use - of AIM to take over just that part of the plugin. - ================================================================================ diff -Naru kdenetwork-3.5.10_orig/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp kdenetwork-3.5.10/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp --- kdenetwork-3.5.10_orig/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp 2005-09-10 08:20:25.000000000 +0000 +++ kdenetwork-3.5.10/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp 2018-04-26 09:02:05.730901020 +0000 @@ -55,15 +55,12 @@ { // Groups that are converted can almost certainly be removed entirely - if ( group == "MSN" || group == "ICQ" || group == "Oscar" || group == "Gadu" || group == "Jabber" || group == "IRC" ) + if ( group == "MSN" || group == "ICQ" || group == "Gadu" || group == "Jabber" || group == "IRC" ) { accountId = "EMPTY"; autoConnect = "true"; - if ( group == "Oscar" ) - protocol = "AIMProtocol"; - else - protocol = group + "Protocol"; + protocol = group + "Protocol"; password = QString::null; pluginData.clear(); diff -Naru kdenetwork-3.5.10_orig/kopete/kopete/kconf_update/kopete-pluginloader.pl kdenetwork-3.5.10/kopete/kopete/kconf_update/kopete-pluginloader.pl --- kdenetwork-3.5.10_orig/kopete/kopete/kconf_update/kopete-pluginloader.pl 2005-09-10 08:20:25.000000000 +0000 +++ kdenetwork-3.5.10/kopete/kopete/kconf_update/kopete-pluginloader.pl 2018-04-26 09:02:26.686644030 +0000 @@ -16,7 +16,6 @@ $moduleLine =~ s/^Modules/Plugins/; $moduleLine =~ s/\.plugin/\.desktop/g; -$moduleLine =~ s/oscar/aim/; if ( $logging == "true" ) { chomp $moduleLine; diff -Naru kdenetwork-3.5.10_orig/kopete/kopete/kimiface.h kdenetwork-3.5.10/kopete/kopete/kimiface.h --- kdenetwork-3.5.10_orig/kopete/kopete/kimiface.h 2005-09-10 08:20:26.000000000 +0000 +++ kdenetwork-3.5.10/kopete/kopete/kimiface.h 2018-04-26 09:01:08.823598436 +0000 @@ -106,8 +106,8 @@ /** * Get the KABC uid corresponding to the supplied IM address * Protocols should be - * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, screenname for AIM, nick for IRC. - * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICQProtocol", + * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, nick for IRC. + * @param protocol the protocol, eg one of "MSNProtocol", "ICQProtocol", * @return a KABC uid or null if none found/ */ virtual QString locate( const QString & contactId, const QString & protocol ) = 0; @@ -166,8 +166,8 @@ // Contact list /** * Add a contact to the contact list - * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, screenname for AIM, nick for IRC. - * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICQProtocol", ... + * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, nick for IRC. + * @param protocol the protocol, eg one of "MSNProtocol", "ICQProtocol", ... * @return whether the add succeeded. False may signal already present, protocol not supported, or add operation not supported. */ virtual bool addContact( const QString &contactId, const QString &protocol ) = 0; diff -Naru kdenetwork-3.5.10_orig/kopete/libkopete/kopetecontactlist.cpp kdenetwork-3.5.10/kopete/libkopete/kopetecontactlist.cpp --- kdenetwork-3.5.10_orig/kopete/libkopete/kopetecontactlist.cpp 2006-10-01 17:27:14.000000000 +0000 +++ kdenetwork-3.5.10/kopete/libkopete/kopetecontactlist.cpp 2018-04-26 09:05:36.056441805 +0000 @@ -521,8 +521,8 @@ if( !oldContactElement.isNull() && oldContactElement.tagName() == QString::fromLatin1("address-book-field") ) { // Convert address book fields. - // Jabber will be called "xmpp", Aim/Toc and Aim/Oscar both will - // be called "aim". MSN, AIM, IRC, Oscar and SMS don't use address + // Jabber will be called "xmpp". + // MSN, IRC, Oscar and SMS don't use address // book fields yet; Gadu and ICQ can be converted as-is. // As Yahoo is unfinished we won't try to convert at all. QString id = oldContactElement.attribute( QString::fromLatin1( "id" ), QString::null ); @@ -609,7 +609,6 @@ QString id = oldContactElement.attribute( QString::fromLatin1( "plugin-id" ), QString::null ); QString data = oldContactElement.text(); - bool convertOldAim = false; uint fieldCount = 1; QString addressBookLabel; if( id == QString::fromLatin1("MSNProtocol") ) @@ -622,17 +621,6 @@ fieldCount = 3; addressBookLabel = QString::fromLatin1("irc"); } - else if( id == QString::fromLatin1("OscarProtocol") ) - { - fieldCount = 2; - addressBookLabel = QString::fromLatin1("aim"); - } - else if( id == QString::fromLatin1("AIMProtocol") ) - { - id = QString::fromLatin1("OscarProtocol"); - convertOldAim = true; - addressBookLabel = QString::fromLatin1("aim"); - } else if( id == QString::fromLatin1("ICQProtocol") || id == QString::fromLatin1("WPProtocol") || id == QString::fromLatin1("GaduProtocol") ) { fieldCount = 1; @@ -657,8 +645,8 @@ } // Do the actual conversion - if( id == QString::fromLatin1( "MSNProtocol" ) || id == QString::fromLatin1( "OscarProtocol" ) || - id == QString::fromLatin1( "AIMProtocol" ) || id == QString::fromLatin1( "IRCProtocol" ) || + if( id == QString::fromLatin1( "MSNProtocol" ) || + id == QString::fromLatin1( "IRCProtocol" ) || id == QString::fromLatin1( "ICQProtocol" ) || id == QString::fromLatin1( "JabberProtocol" ) || id == QString::fromLatin1( "SMSProtocol" ) || id == QString::fromLatin1( "WPProtocol" ) || id == QString::fromLatin1( "GaduProtocol" ) ) @@ -692,7 +680,7 @@ dataField = newList.createElement( QString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); dataField.setAttribute( QString::fromLatin1( "key" ), QString::fromLatin1( "displayName" ) ); - if( convertOldAim || id == QString::fromLatin1("ICQProtocol") || id == QString::fromLatin1("WPProtocol") || id == QString::fromLatin1("GaduProtocol") ) + if( id == QString::fromLatin1("ICQProtocol") || id == QString::fromLatin1("WPProtocol") || id == QString::fromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); else if( id == QString::fromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); @@ -742,7 +730,7 @@ idx += 2; } - // MSN, AIM, IRC, Oscar and SMS didn't store address book fields up + // MSN, IRC, Oscar and SMS didn't store address book fields up // to now, so create one if( id != QString::fromLatin1("ICQProtocol") && id != QString::fromLatin1("JabberProtocol") && id != QString::fromLatin1("WPProtocol") && id != QString::fromLatin1("GaduProtocol") ) { diff -Naru kdenetwork-3.5.10_orig/kopete/libkopete/kopetecontactlistelement.cpp kdenetwork-3.5.10/kopete/libkopete/kopetecontactlistelement.cpp --- kdenetwork-3.5.10_orig/kopete/libkopete/kopetecontactlistelement.cpp 2005-09-10 08:20:28.000000000 +0000 +++ kdenetwork-3.5.10/kopete/libkopete/kopetecontactlistelement.cpp 2018-04-26 09:05:56.720200581 +0000 @@ -164,10 +164,6 @@ QMap<QString, QString> pluginData; QString pluginId = element.attribute( QString::fromLatin1( "plugin-id" ), QString::null ); - //in kopete 0.6 the AIM protocol was called OSCAR - if ( pluginId == QString::fromLatin1( "OscarProtocol" ) ) - pluginId = QString::fromLatin1( "AIMProtocol" ); - QDomNode field = element.firstChild(); while( !field.isNull() ) { diff -Naru kdenetwork-3.5.10_orig/kopete/plugins/history/converter.cpp kdenetwork-3.5.10/kopete/plugins/history/converter.cpp --- kdenetwork-3.5.10_orig/kopete/plugins/history/converter.cpp 2007-01-15 11:23:46.000000000 +0000 +++ kdenetwork-3.5.10/kopete/plugins/history/converter.cpp 2018-04-26 09:06:57.931485380 +0000 @@ -80,18 +80,6 @@ KGlobal::config()->setGroup("ICQ"); accountId=KGlobal::config()->readEntry( "UIN" ); } - else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) - { - protocolId="AIMProtocol"; - KGlobal::config()->setGroup("AIM"); - accountId=KGlobal::config()->readEntry( "UserID" ); - } - else if(fi->fileName() == "OscarProtocol" ) - { - protocolId="AIMProtocol"; - KGlobal::config()->setGroup("OSCAR"); - accountId=KGlobal::config()->readEntry( "UserID" ); - } else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs") { protocolId="JabberProtocol"; @@ -329,10 +317,6 @@ return true; else if(fi->fileName() == "ICQProtocol" || fi->fileName() == "icq_logs" ) return true; - else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) - return true; - else if(fi->fileName() == "OscarProtocol" ) - return true; else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs") return true; ++it; diff -Naru kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_html.xsl kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_html.xsl --- kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_html.xsl 2005-09-10 08:20:16.000000000 +0000 +++ kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_html.xsl 2018-04-26 09:07:19.495236486 +0000 @@ -54,9 +54,6 @@ <xsl:template match="protocol"> <xsl:choose> - <xsl:when test=".='AIMProtocol'"> - <xsl:text>AIM</xsl:text> - </xsl:when> <xsl:when test=".='MSNProtocol'"> <xsl:text>MSN</xsl:text> </xsl:when> diff -Naru kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_html_images.xsl kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_html_images.xsl --- kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_html_images.xsl 2005-09-10 08:20:16.000000000 +0000 +++ kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_html_images.xsl 2018-04-26 09:07:35.743048692 +0000 @@ -36,9 +36,6 @@ <xsl:when test=".='YahooProtocol'"> <img src="{$images}/yahoo_protocol.png" alt="Yahoo" title="Yahoo"/> </xsl:when> - <xsl:when test=".='AIMProtocol'"> - <img src="{$images}/aim_protocol.png" alt="AIM" title="AIM"/> - </xsl:when> <xsl:when test=".='IRCProtocol'"> <img src="{$images}/irc_protocol.png" alt="IRC" title="IRC"/> </xsl:when> diff -Naru kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_xhtml.xsl kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_xhtml.xsl --- kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_xhtml.xsl 2005-09-10 08:20:16.000000000 +0000 +++ kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_xhtml.xsl 2018-04-26 09:07:47.006918365 +0000 @@ -53,9 +53,6 @@ <xsl:template match="protocol"> <xsl:choose> - <xsl:when test=".='AIMProtocol'"> - <xsl:text>AIM</xsl:text> - </xsl:when> <xsl:when test=".='MSNProtocol'"> <xsl:text>MSN</xsl:text> </xsl:when> diff -Naru kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_xhtml_images.xsl kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_xhtml_images.xsl --- kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresence_xhtml_images.xsl 2005-09-10 08:20:16.000000000 +0000 +++ kdenetwork-3.5.10/kopete/plugins/webpresence/webpresence_xhtml_images.xsl 2018-04-26 09:07:57.526796560 +0000 @@ -37,9 +37,6 @@ <xsl:when test=".='YahooProtocol'"> <img src="{$images}/yahoo_protocol.png" alt="Yahoo" title="Yahoo"/> </xsl:when> - <xsl:when test=".='AIMProtocol'"> - <img src="{$images}/aim_protocol.png" alt="AIM" title="AIM"/> - </xsl:when> <xsl:when test=".='IRCProtocol'"> <img src="{$images}/irc_protocol.png" alt="IRC" title="IRC"/> </xsl:when> diff -Naru kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresenceprefs.ui kdenetwork-3.5.10/kopete/plugins/webpresence/webpresenceprefs.ui --- kdenetwork-3.5.10_orig/kopete/plugins/webpresence/webpresenceprefs.ui 2018-04-26 08:58:26.193587399 +0000 +++ kdenetwork-3.5.10/kopete/plugins/webpresence/webpresenceprefs.ui 2018-04-26 09:08:18.686551313 +0000 @@ -213,7 +213,6 @@ images/icq_protocol.png images/jabber_protocol.png images/yahoo_protocol.png -images/aim_protocol.png images/irc_protocol.png images/sms_protocol.png images/gadu_protocol.png diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/jabber/jabbertransport.cpp kdenetwork-3.5.10/kopete/protocols/jabber/jabbertransport.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/jabber/jabbertransport.cpp 2006-10-01 17:26:47.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/jabber/jabbertransport.cpp 2018-04-26 09:08:41.678284423 +0000 @@ -58,8 +58,6 @@ cIcon="jabber_gateway_msn"; else if(gateway_type=="icq") cIcon="jabber_gateway_icq"; - else if(gateway_type=="aim") - cIcon="jabber_gateway_aim"; else if(gateway_type=="yahoo") cIcon="jabber_gateway_yahoo"; else if(gateway_type=="sms") diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/Makefile.am kdenetwork-3.5.10/kopete/protocols/oscar/Makefile.am --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/Makefile.am 2006-10-01 17:26:54.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/Makefile.am 2018-04-26 09:09:11.913932831 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = liboscar . aim icq icons +SUBDIRS = liboscar . icq icons METASOURCES = AUTO AM_CPPFLAGS = -I./ui -I$(srcdir)/ui \ -I./liboscar -I$(srcdir)/liboscar \ diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/TODO kdenetwork-3.5.10/kopete/protocols/oscar/TODO --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/TODO 2006-10-01 17:26:54.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/TODO 2018-04-26 09:09:48.073511458 +0000 @@ -3,7 +3,6 @@ ====== Possible refactorings ===== - Unify status handling for ICQ and AIM? I like the ICQ::Presence thing, that's cool -- Do delayed contact creation like on MSN so that when we actually get a good status code back from the SSI manipulation, we create the contact then rather than hoping it all works out. - serialize all the ssi information, either via properties for via the @@ -47,7 +46,6 @@ for the same account, one at home and one at work). - make renaming serverside contacts possible (function is there but fails due to massive contactlist bugs caused by above mentioned classes) -- support logging in with something different than "online" status for AIM - finish icq userinfo dialog and sending your own icq userinfo to the server, it's easy to do but because of the mass of items takes lots of time and is extremely boring. (requires snac 0x15, * parsing) diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/aim/Makefile.am kdenetwork-3.5.10/kopete/protocols/oscar/aim/Makefile.am --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/aim/Makefile.am 2006-10-01 17:26:53.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/aim/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -SUBDIRS = ui -METASOURCES = AUTO -AM_CPPFLAGS = -I$(srcdir)/../ \ - -I$(srcdir)/ui/ \ - -I$(top_builddir)/kopete/protocols/oscar/aim/ui \ - -I$(srcdir)/../liboscar \ - $(KOPETE_INCLUDES) $(all_includes) - -kde_module_LTLIBRARIES = kopete_aim.la - -kopete_aim_la_SOURCES = aimprotocol.cpp aimaccount.cpp aimcontact.cpp aimuserinfo.cpp aimjoinchat.cpp aimchatsession.cpp - -kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -kopete_aim_la_LIBADD = ../libkopete_oscar.la ui/libkopeteaimui.la \ - $(top_builddir)/kopete/libkopete/libkopete.la - -service_DATA = kopete_aim.desktop aim.protocol -servicedir = $(kde_servicesdir) diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/icq/kopete_icq.desktop kdenetwork-3.5.10/kopete/protocols/oscar/icq/kopete_icq.desktop --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/icq/kopete_icq.desktop 2008-08-19 18:13:35.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/icq/kopete_icq.desktop 2018-04-26 09:11:03.136633784 +0000 @@ -23,7 +23,7 @@ Comment[be]=Пратакол ICQ Comment[bg]=Протокол за връзка с ICQ Comment[bn]=আই-সি-কিউতে সংযোগ করতে প্রোটোকল -Comment[br]=Komenad kevreañ ouzh AIM +Comment[br]=Komenad kevreañ ouzh ICQ Comment[bs]=ICQ protokol Comment[ca]=Protocol per a connectar-se a ICQ Comment[cs]=Protokol k připojení k ICQ diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/Makefile.am kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/Makefile.am --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/Makefile.am 2008-02-13 09:37:43.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/Makefile.am 2018-04-27 05:19:15.653719459 +0000 @@ -8,7 +8,7 @@ liboscar_la_SOURCES = oscarutils.cpp client.cpp task.cpp connector.cpp \ inputprotocolbase.cpp coreprotocol.cpp flapprotocol.cpp snacprotocol.cpp transfer.cpp rtf.cc \ bytestream.cpp oscarclientstream.cpp safedelete.cpp stream.cpp oscarconnector.cpp \ - oscarbytestream.cpp buffer.cpp md5.c logintask.cpp aimlogintask.cpp icqlogintask.cpp \ + oscarbytestream.cpp buffer.cpp md5.c logintask.cpp icqlogintask.cpp \ closeconnectiontask.cpp rateclassmanager.cpp serverversionstask.cpp rateinfotask.cpp \ errortask.cpp locationrightstask.cpp profiletask.cpp blmlimitstask.cpp \ servicesetuptask.cpp icbmparamstask.cpp ssimanager.cpp rateclass.cpp rateclass.h \ diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/buddyicontask.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/buddyicontask.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/buddyicontask.cpp 2006-10-01 17:26:52.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/buddyicontask.cpp 2018-04-27 04:47:06.264900859 +0000 @@ -69,10 +69,7 @@ if ( m_action == Receive ) { - if ( client()->isIcq() ) - sendICQBuddyIconRequest(); - else - sendAIMBuddyIconRequest(); + sendICQBuddyIconRequest(); } else sendIcon(); @@ -120,8 +117,6 @@ setTransfer( transfer ); if ( st->snacSubtype() == 0x0003 ) handleUploadResponse(); - else if ( st->snacSubtype() == 0x0005 ) - handleAIMBuddyIconResponse(); else handleICQBuddyIconResponse(); @@ -157,41 +152,6 @@ } -void BuddyIconTask::sendAIMBuddyIconRequest() -{ - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting buddy icon for " << m_user << endl; - FLAP f = { 0x02, 0, 0 }; - m_seq = client()->snacSequence(); - SNAC s = { 0x0010, 0x0004, 0x0000, m_seq }; - Buffer* b = new Buffer; - - b->addBUIN( m_user.latin1() ); //TODO: check encoding - b->addByte( 0x01 ); - b->addWord( 0x0001 ); - b->addByte( m_hashType ); - b->addByte( m_hash.size() ); //MD5 Hash Size - b->addString( m_hash, m_hash.size() ); //MD5 Hash - Transfer* t = createTransfer( f, s, b ); - send( t ); -} - -void BuddyIconTask::handleAIMBuddyIconResponse() -{ - Buffer* b = transfer()->buffer(); - QString user = b->getBUIN(); - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Receiving buddy icon for " << user << endl; - b->skipBytes(2); //unknown field. not used - BYTE iconType = b->getByte(); - Q_UNUSED( iconType ); - BYTE hashSize = b->getByte(); - QByteArray iconHash; - iconHash.duplicate( b->getBlock(hashSize) ); - WORD iconSize = b->getWord(); - QByteArray icon; - icon.duplicate( b->getBlock(iconSize) ); - emit haveIcon( user, icon ); -} - void BuddyIconTask::sendICQBuddyIconRequest() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting buddy icon for " << m_user << endl; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/buddyicontask.h kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/buddyicontask.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/buddyicontask.h 2005-09-10 08:20:23.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/buddyicontask.h 2018-04-27 04:47:23.876623979 +0000 @@ -49,8 +49,6 @@ private: void sendIcon(); void handleUploadResponse(); - void sendAIMBuddyIconRequest(); - void handleAIMBuddyIconResponse(); void sendICQBuddyIconRequest(); void handleICQBuddyIconResponse(); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/changevisibilitytask.h kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/changevisibilitytask.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/changevisibilitytask.h 2005-09-10 08:20:23.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/changevisibilitytask.h 2018-04-27 04:47:37.364411910 +0000 @@ -24,7 +24,7 @@ /** * This class provides a way to change how the account user * appears on everybody else's contact list. It is used to - * implement the invisible online status in ICQ and AIM + * implement the invisible online status in ICQ * @author Matt Rogers */ class ChangeVisibilityTask : public Task diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/client.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/client.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/client.cpp 2008-02-13 09:37:43.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/client.cpp 2018-04-27 04:50:43.296316289 +0000 @@ -93,7 +93,6 @@ int stage; //Protocol specific data - bool isIcq; bool redirectRequested; QValueList<WORD> redirectionServices; WORD currentRedirect; @@ -146,9 +145,8 @@ d = new ClientPrivate; d->tzoffset = 0; d->active = false; - d->isIcq = false; //default to AIM d->redirectRequested = false; - d->currentRedirect = 0; + d->currentRedirect = 0; d->connectAsStatus = 0x0; // default to online d->ssiManager = new SSIManager( this ); d->settings = new Oscar::Settings(); @@ -233,30 +231,6 @@ d->ssiManager->clear(); } -void Client::setStatus( AIMStatus status, const QString &_message ) -{ - // AIM: you're away exactly when your away message isn't empty. - // can't use QString::null as a message either; ProfileTask - // interprets null as "don't change". - QString message; - if ( status == Online ) - message = QString::fromAscii(""); - else - { - if ( _message.isEmpty() ) - message = QString::fromAscii(" "); - else - message = _message; - } - - Connection* c = d->connections.connectionForFamily( 0x0002 ); - if ( !c ) - return; - ProfileTask* pt = new ProfileTask( c->rootTask() ); - pt->setAwayMessage( message ); - pt->go( true ); -} - void Client::setStatus( DWORD status, const QString &message ) { // remember the message to reply with, when requested @@ -398,23 +372,19 @@ { d->active = true; - if ( isIcq() ) - setStatus( d->connectAsStatus, d->connectWithMessage ); + setStatus( d->connectAsStatus, d->connectWithMessage ); d->ownStatusTask->go(); - if ( isIcq() ) - { - //retrieve offline messages - Connection* c = d->connections.connectionForFamily( 0x0015 ); - if ( !c ) - return; + //retrieve offline messages + Connection* c = d->connections.connectionForFamily( 0x0015 ); + if ( !c ) + return; - OfflineMessagesTask *offlineMsgTask = new OfflineMessagesTask( c->rootTask() ); - connect( offlineMsgTask, SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ), - this, SIGNAL( messageReceived(const Oscar::Message& ) ) ); - offlineMsgTask->go( true ); - } + OfflineMessagesTask *offlineMsgTask = new OfflineMessagesTask( c->rootTask() ); + connect( offlineMsgTask, SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ), + this, SIGNAL( messageReceived(const Oscar::Message& ) ) ); + offlineMsgTask->go( true ); emit haveSSIList(); emit loggedIn(); @@ -595,16 +565,6 @@ return d->active; } -bool Client::isIcq() const -{ - return d->isIcq; -} - -void Client::setIsIcq( bool isIcq ) -{ - d->isIcq = isIcq; -} - void Client::debug( const QString& str ) { Q_UNUSED(str); @@ -852,16 +812,6 @@ d->exchanges = exchanges; } -void Client::requestAIMProfile( const QString& contact ) -{ - d->userInfoTask->requestInfoFor( contact, UserInfoTask::Profile ); -} - -void Client::requestAIMAwayMessage( const QString& contact ) -{ - d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage ); -} - void Client::requestICQAwayMessage( const QString& contact, ICQStatus contactStatus ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting away message for " << contact << endl; @@ -993,16 +943,6 @@ ust->searchUserByUIN( uin ); } -void Client::updateProfile( const QString& profile ) -{ - Connection* c = d->connections.connectionForFamily( 0x0002 ); - if ( !c ) - return; - ProfileTask* pt = new ProfileTask( c->rootTask() ); - pt->setProfileText( profile ); - pt->go(true); -} - void Client::sendTyping( const QString & contact, bool typing ) { Connection* c = d->connections.connectionForFamily( 0x0004 ); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/client.h kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/client.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/client.h 2006-10-01 17:26:52.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/client.h 2018-04-27 04:51:45.535388212 +0000 @@ -67,7 +67,6 @@ FatalProtocolError = 3 }; - enum AIMStatus { Online = 0, Away }; enum ICQStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; /************* @@ -101,8 +100,6 @@ /** Logout and disconnect */ void close(); - /** Set our status for AIM */ - void setStatus( AIMStatus status, const QString &message = QString::null ); /** Set our status for ICQ */ void setStatus( DWORD status, const QString &message = QString::null ); @@ -240,18 +237,6 @@ QValueList<int> chatExchangeList() const; /** - * Request the aim profile - * \param contact the contact to get info for - */ - void requestAIMProfile( const QString& contact ); - - /** - * Request the aim away message - * \param contact the contact to get info for - */ - void requestAIMAwayMessage( const QString& contact ); - - /** * Add the icq away message request to queue * \param contact the contact to get info for */ @@ -272,9 +257,6 @@ //! Run a UIN search void uinSearch( const QString& uin ); - //! Update the user's AIM profile - void updateProfile( const QString& profile ); - //! Get buddy icon information for a person void requestBuddyIcon( const QString& user, const QByteArray& hash, BYTE hashType ); @@ -343,10 +325,6 @@ /** Change the current status message w/o changing status */ void setStatusMessage( const QString &message ); - /** ICQ Settings */ - bool isIcq() const; - void setIsIcq( bool isIcq ); - /** Host's IP address */ QCString ipAddress() const; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/clientreadytask.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/clientreadytask.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/clientreadytask.cpp 2005-09-10 08:20:23.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/clientreadytask.cpp 2018-04-27 04:54:00.230162344 +0000 @@ -64,38 +64,19 @@ buffer->addWord( 0x0003 ); break; case 0x0013: - buffer->addWord( client()->isIcq() ? 0x0002 : 0x0003 ); + buffer->addWord( 0x0002 ); break; default: buffer->addWord( 0x0001 ); }; - if ( client()->isIcq() ) - { - if ( i == 0x0002 ) - buffer->addWord( 0x0101 ); - else - buffer->addWord( 0x0110 ); + if ( i == 0x0002 ) + buffer->addWord( 0x0101 ); + else + buffer->addWord( 0x0110 ); - //always add 0x047B - buffer->addWord( 0x047B ); - } - else //we're AIM so AOL has us do something completely different! *sigh* - { - switch( i ) - { - case 0x0008: - case 0x000B: - case 0x000C: - buffer->addWord( 0x0104 ); - buffer->addWord( 0x0001 ); - break; - default: - buffer->addWord( 0x0110 ); - buffer->addWord( 0x059B ); - break; - }; - } + //always add 0x047B + buffer->addWord( 0x047B ); } //send the damn thing so we can finally be finished diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/connection.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/connection.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/connection.cpp 2006-10-01 17:26:52.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/connection.cpp 2018-04-27 04:54:15.229926474 +0000 @@ -154,11 +154,6 @@ return d->client->password(); } -bool Connection::isIcq() const -{ - return d->client->isIcq(); -} - Task* Connection::rootTask() const { return d->root; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/connection.h kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/connection.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/connection.h 2006-10-01 17:26:52.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/connection.h 2018-04-27 04:54:23.349798904 +0000 @@ -142,7 +142,6 @@ QString userId() const; QString password() const; - bool isIcq() const; SSIManager* ssiManager() const; const Oscar::ClientVersion* version() const; RateClassManager* rateManager() const; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/logintask.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/logintask.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/logintask.cpp 2005-09-10 08:20:23.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/logintask.cpp 2018-04-27 04:56:28.104315428 +0000 @@ -1,6 +1,6 @@ /* Kopete Oscar Protocol - logintask.cpp - Handles logging into to the AIM or ICQ service + logintask.cpp - Handles logging into to the ICQ service Copyright (c) 2004 Matt Rogers <mattr@kde.org> @@ -22,7 +22,6 @@ #include <kdebug.h> #include <klocale.h> -#include "aimlogintask.h" #include "connection.h" #include "closeconnectiontask.h" #include "icqlogintask.h" @@ -40,14 +39,12 @@ StageOneLoginTask::StageOneLoginTask( Task* parent ) : Task ( parent ) { - m_aimTask = 0L; m_icqTask = 0L; m_closeTask = 0L; } StageOneLoginTask::~StageOneLoginTask() { - delete m_aimTask; delete m_icqTask; delete m_closeTask; } @@ -56,33 +53,13 @@ { if ( forMe( transfer ) ) { - if ( client()->isIcq() ) - { - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Starting ICQ login" << endl; - m_icqTask = new IcqLoginTask( client()->rootTask() ); - m_closeTask = new CloseConnectionTask( client()->rootTask() ); + kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Starting ICQ login" << endl; + m_icqTask = new IcqLoginTask( client()->rootTask() ); + m_closeTask = new CloseConnectionTask( client()->rootTask() ); - //connect finished signal - connect( m_closeTask, SIGNAL( finished() ), this, SLOT( closeTaskFinished() ) ); - m_icqTask->go( true ); - } - else - { - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Starting AIM login" << endl; - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Sending the FLAP version back" << endl; - - //send the flap version response - FLAP f = { 0x01, 0 , 0 }; - Buffer *outbuf = new Buffer; - outbuf->addDWord(0x00000001); //flap version - f.length = outbuf->length(); - Transfer* ft = createTransfer( f, outbuf ); - send( ft ); - - m_aimTask = new AimLoginTask( client()->rootTask() ); - connect( m_aimTask, SIGNAL( finished() ), this, SLOT( aimTaskFinished() ) ); - m_aimTask->go( true ); - } + //connect finished signal + connect( m_closeTask, SIGNAL( finished() ), this, SLOT( closeTaskFinished() ) ); + m_icqTask->go( true ); return true; } return false; @@ -98,16 +75,6 @@ setSuccess( m_closeTask->statusCode(), m_closeTask->statusString() ); } -void StageOneLoginTask::aimTaskFinished() -{ - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - m_cookie = m_aimTask->cookie(); - m_bosPort = m_aimTask->bosPort(); - m_bosServer = m_aimTask->bosHost(); - - setSuccess( m_aimTask->statusCode(), m_aimTask->statusString() ); -} - bool StageOneLoginTask::forMe( Transfer* transfer ) const { FlapTransfer* ft = dynamic_cast<FlapTransfer*> ( transfer ); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/logintask.h kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/logintask.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/logintask.h 2005-09-10 08:20:23.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/logintask.h 2018-04-27 04:57:00.183930222 +0000 @@ -1,6 +1,6 @@ /* Kopete Oscar Protocol - logintask.h - Handles logging into to the AIM or ICQ service + logintask.h - Handles logging into to the ICQ service Copyright (c) 2004 Matt Rogers <mattr@kde.org> @@ -23,7 +23,6 @@ #include "oscartypes.h" #include "task.h" -#include "aimlogintask.h" #include "icqlogintask.h" #include "closeconnectiontask.h" @@ -69,7 +68,6 @@ public slots: void closeTaskFinished(); - void aimTaskFinished(); protected: bool forMe( Transfer* transfer ) const; @@ -77,7 +75,6 @@ private: //Tasks we want to control - AimLoginTask* m_aimTask; IcqLoginTask* m_icqTask; CloseConnectionTask* m_closeTask; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/oscartypes.h kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/oscartypes.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/oscartypes.h 2007-10-08 11:56:35.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/oscartypes.h 2018-04-27 04:57:23.999636499 +0000 @@ -27,7 +27,6 @@ //! Debug Areas const int OSCAR_RAW_DEBUG = 14151; const int OSCAR_GEN_DEBUG = 14150; -const int OSCAR_AIM_DEBUG = 14152; const int OSCAR_ICQ_DEBUG = 14153; namespace Oscar @@ -248,9 +247,6 @@ /* ICQ Version Characteristics */ const unsigned char ICQ_TCP_VERSION = 0x0008; - /* AIM Version Characteristics */ - const char AIM_MD5_STRING[] = "AOL Instant Messenger (SM)"; - /* SSI types */ const WORD ROSTER_CONTACT = 0x0000; // a normal contact const WORD ROSTER_GROUP = 0x0001; // a group of contacts diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/profiletask.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/profiletask.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/profiletask.cpp 2006-10-01 17:26:52.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/profiletask.cpp 2018-04-27 04:58:53.162137683 +0000 @@ -74,39 +74,13 @@ Buffer *buffer = new Buffer(); Buffer capBuf; - if ( !m_profileText.isNull() && !client()->isIcq() ) - { - static const QString defencoding = "text/aolrtf; charset=\"us-ascii\""; - buffer->addTLV(0x0001, defencoding.length(), defencoding.latin1()); - buffer->addTLV(0x0002, m_profileText.length(), m_profileText.local8Bit()); - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting profile = " << m_profileText << endl; - } - - if ( !m_awayMessage.isNull() && !client()->isIcq() ) - { - static const QString defencoding = "text/aolrtf; charset=\"us-ascii\""; - buffer->addTLV(0x0003, defencoding.length(), defencoding.latin1()); - buffer->addTLV(0x0004, m_awayMessage.length(), m_awayMessage.local8Bit()); - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting away message = " << m_awayMessage << endl; - } - - if ( client()->isIcq() ) - { - capBuf.addString( oscar_caps[CAP_ICQSERVERRELAY], 16 ); // we support type-2 messages - capBuf.addString( oscar_caps[CAP_UTF8], 16 ); // we can send/receive UTF encoded messages - capBuf.addString( oscar_caps[CAP_ISICQ], 16 ); // I think this is an icq client, but maybe I'm wrong - capBuf.addString( oscar_caps[CAP_KOPETE], 16 ); // we are the borg, resistance is futile - //capBuf.addString( oscar_caps[CAP_RTFMSGS], 16 ); // we do incoming RTF messages - capBuf.addString( oscar_caps[CAP_TYPING], 16 ); // we know you're typing something to us! - capBuf.addString( oscar_caps[CAP_BUDDYICON], 16 ); //can you take my picture? - } - else - { - capBuf.addString( oscar_caps[CAP_UTF8], 16 ); //we can send/receive UTF encoded messages - capBuf.addString( oscar_caps[CAP_KOPETE], 16 ); // we are the borg, resistance is futile - capBuf.addString( oscar_caps[CAP_TYPING], 16 ); // we know you're typing something to us! - capBuf.addString( oscar_caps[CAP_BUDDYICON], 16 ); //can you take my picture? - } + capBuf.addString( oscar_caps[CAP_ICQSERVERRELAY], 16 ); // we support type-2 messages + capBuf.addString( oscar_caps[CAP_UTF8], 16 ); // we can send/receive UTF encoded messages + capBuf.addString( oscar_caps[CAP_ISICQ], 16 ); // I think this is an icq client, but maybe I'm wrong + capBuf.addString( oscar_caps[CAP_KOPETE], 16 ); // we are the borg, resistance is futile + //capBuf.addString( oscar_caps[CAP_RTFMSGS], 16 ); // we do incoming RTF messages + capBuf.addString( oscar_caps[CAP_TYPING], 16 ); // we know you're typing something to us! + capBuf.addString( oscar_caps[CAP_BUDDYICON], 16 ); //can you take my picture? //kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "adding capabilities, size=" << capBuf.length() << endl; buffer->addTLV(0x0005, capBuf.length(), capBuf.buffer()); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/profiletask.h kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/profiletask.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/profiletask.h 2005-09-10 08:20:23.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/profiletask.h 2018-04-27 04:59:16.725676912 +0000 @@ -21,8 +21,7 @@ #include "task.h" /** -Task that sets the profile and away message on the server (AIM only). -Also takes care of updating the capabilities supported by the client (AIM and ICQ). +Also takes care of updating the capabilities supported by the client (ICQ). The profile will be updated only if the profile text has been set non-null. The away message will be set only if the away message has been set non-null. diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/sendmessagetask.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/sendmessagetask.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/sendmessagetask.cpp 2006-10-01 17:26:52.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/sendmessagetask.cpp 2018-04-27 05:00:56.979804438 +0000 @@ -98,21 +98,9 @@ break; } - // Add the TLV to indicate if this is an autoresponse: 0x00040000 - // Right now, only supported for the AIM client, I'm not sure about ICQ - // For some reason you can't have both a 0x0004 and 0x0003 TLV in the same - // SNAC, if you do the AIM server complains - if ( !client()->isIcq() && (m_autoResponse == true) ) - { - TLV tlv4( 0x0004, 0, NULL); - b->addTLV( tlv4 ); - } - else - { - b->addDWord( 0x00030000 ); //empty TLV 3 to get an ack from the server - } + b->addDWord( 0x00030000 ); //empty TLV 3 to get an ack from the server - if ( client()->isIcq() && m_message.type() != 2 && ! m_message.hasProperty( Oscar::Message::StatusMessageRequest ) ) + if ( m_message.type() != 2 && ! m_message.hasProperty( Oscar::Message::StatusMessageRequest ) ) b->addDWord( 0x00060000 ); //empty TLV 6 to store message on the server if not online } else @@ -141,18 +129,10 @@ { Buffer tlv2buffer; - //Send features TLV using data from gaim. Features are different - //depending on whether we're ICQ or AIM - if ( client()->isIcq() ) - { - tlv2buffer.addDWord( 0x05010002 ); //TLV 0x0501, length 2 - tlv2buffer.addWord( 0x0106 ); //TLV 0x0501 data - } - else - { - tlv2buffer.addDWord( 0x05010004 ); //TLV 0x0501, length 4 - tlv2buffer.addDWord( 0x01010102 ); //TLV 0x0501 data. - } + //Send features TLV using data from gaim. + tlv2buffer.addDWord( 0x05010002 ); //TLV 0x0501, length 2 + tlv2buffer.addWord( 0x0106 ); //TLV 0x0501 data + //we only send one message part. There's only one client that actually uses //them and it's quite old and infrequently used tlv2buffer.addWord( 0x0101 ); //add TLV(0x0101) also known as TLV(257) diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/serverversionstask.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/serverversionstask.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/serverversionstask.cpp 2005-09-10 08:20:23.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/serverversionstask.cpp 2018-04-27 05:02:23.722272120 +0000 @@ -115,7 +115,6 @@ void ServerVersionsTask::requestFamilyVersions() { - bool isIcq = client()->isIcq(); int listLength = m_familiesList.count(); FLAP f = { 0x02, 0, 0 }; @@ -134,10 +133,7 @@ { if ( m_familiesList[i] == 0x0013 ) { - if ( isIcq ) - val = 0x0004; // for ICQ2002 - else - val = 0x0003; + val = 0x0004; // for ICQ2002 } else val = 0x0001; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/tests/logintest.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/tests/logintest.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/tests/logintest.cpp 2005-09-10 08:20:22.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/tests/logintest.cpp 2018-04-27 05:02:36.370053906 +0000 @@ -33,7 +33,6 @@ // connect to server qDebug( "connecting to server "); - myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); myClient->connectToServer( myConnection, server, true ); connected = true; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp 2005-09-10 08:20:22.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp 2018-04-27 05:03:09.477487951 +0000 @@ -33,7 +33,6 @@ // connect to server qDebug( "connecting to server "); - myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); myClient->connectToServer( myConnection, server, true ); QTimer::singleShot( 10000, this, SLOT(runAddGroupTest() ) ); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp 2005-09-10 08:20:22.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp 2018-04-27 05:03:20.217305890 +0000 @@ -33,7 +33,6 @@ // connect to server qDebug( "connecting to server "); - myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); myClient->connectToServer( myConnection, server, true ); //QObject::connect( myClient, SIGNAL( userIsOnline( const QString& ) ), this, SLOT( runUserInfoTest())); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscaraccount.cpp kdenetwork-3.5.10/kopete/protocols/oscar/oscaraccount.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscaraccount.cpp 2007-01-15 11:23:51.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/oscaraccount.cpp 2018-04-27 05:06:07.874959200 +0000 @@ -95,21 +95,17 @@ }; OscarAccount::OscarAccount(Kopete::Protocol *parent, const QString &accountID, const char *name, bool isICQ) -: Kopete::PasswordedAccount( parent, accountID, isICQ ? 8 : 16, name ) +: Kopete::PasswordedAccount( parent, accountID, 8, name ) { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << " accountID='" << accountID << "', isICQ=" << isICQ << endl; d = new OscarAccountPrivate( *this ); d->engine = new Client( this ); - d->engine->setIsIcq( isICQ ); d->versionAlreadyUpdated = false; d->versionUpdaterStamp = OscarVersionUpdater::self()->stamp(); - if ( isICQ ) - d->engine->setVersion( OscarVersionUpdater::self()->getICQVersion() ); - else - d->engine->setVersion( OscarVersionUpdater::self()->getAIMVersion() ); + d->engine->setVersion( OscarVersionUpdater::self()->getICQVersion() ); d->engine->setCodecProvider( d ); d->olnscDialog = 0L; @@ -182,13 +178,6 @@ kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "processing SSI list" << endl; processSSIList(); - //start a chat nav connection - if ( !engine()->isIcq() ) - { - kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "sending request for chat nav service" << endl; - d->engine->requestServerRedirect( 0x000D ); - } - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "sending request for icon service" << endl; d->engine->requestServerRedirect( 0x0010 ); @@ -473,7 +462,7 @@ if ( image.isNull() ) return; - const QSize size = ( d->engine->isIcq() ) ? QSize( 52, 64 ) : QSize( 48, 48 ); + const QSize size = QSize( 52, 64 ); image = image.smoothScale( size, QImage::ScaleMax ); if( image.width() > size.width()) @@ -805,9 +794,8 @@ QString OscarAccount::getFLAPErrorMessage( int code ) { - bool isICQ = d->engine->isIcq(); - QString acctType = isICQ ? i18n("ICQ") : i18n("AIM"); - QString acctDescription = isICQ ? i18n("ICQ user id", "UIN") : i18n("AIM user id", "screen name"); + QString acctType = i18n("ICQ"); + QString acctDescription = i18n("ICQ user id", "UIN"); QString reason; //FLAP errors are always fatal //negative codes are things added by liboscar developers diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscaraccount.h kdenetwork-3.5.10/kopete/protocols/oscar/oscaraccount.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscaraccount.h 2006-10-01 17:26:54.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/oscaraccount.h 2018-04-27 05:06:29.338707131 +0000 @@ -44,7 +44,7 @@ Q_OBJECT public: - OscarAccount(Kopete::Protocol *parent, const QString &accountID, const char *name=0L, bool isICQ=false); + OscarAccount(Kopete::Protocol *parent, const QString &accountID, const char *name=0L, bool isICQ=true); virtual ~OscarAccount(); /** Provide the derived accounts and contacts with access to the backend */ diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscarcontact.cpp kdenetwork-3.5.10/kopete/protocols/oscar/oscarcontact.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscarcontact.cpp 2007-05-14 07:40:08.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/oscarcontact.cpp 2018-04-27 05:07:06.330266233 +0000 @@ -170,15 +170,10 @@ QStringList capList; // Append client name and version in case we found one - if ( m_details.userClass() & 0x0080 /* WIRELESS */ ) - capList << i18n( "Mobile AIM Client" ); - else + if ( !m_details.clientName().isEmpty() ) { - if ( !m_details.clientName().isEmpty() ) - { - capList << i18n( "Translators: client name and version", - "%1").arg( m_details.clientName() ); - } + capList << i18n( "Translators: client name and version", + "%1").arg( m_details.clientName() ); } // and now for some general informative capabilities diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscarversionupdater.cpp kdenetwork-3.5.10/kopete/protocols/oscar/oscarversionupdater.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscarversionupdater.cpp 2008-08-19 18:13:35.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/oscarversionupdater.cpp 2018-04-27 05:08:10.209518266 +0000 @@ -32,7 +32,6 @@ : mStamp( 1 ), mUpdating( false ) { initICQVersionInfo(); - initAIMVersionInfo(); } OscarVersionUpdater::~OscarVersionUpdater() @@ -100,37 +99,8 @@ mICQVersion.lang = config.readEntry( "Lang", "en" ); } -void OscarVersionUpdater::initAIMVersionInfo() -{ - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - - KConfigGroup config( KGlobal::config(), "AIMVersion" ); - - mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" ); - mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 ); - mAIMVersion.major = config.readEntry( "Major", "0x0005" ).toUShort( 0, 0 ); - mAIMVersion.minor = config.readEntry( "Minor", "0x0001" ).toUShort( 0, 0 ); - mAIMVersion.point = config.readEntry( "Point", "0x0000" ).toUShort( 0, 0 ); - mAIMVersion.build = config.readEntry( "Build", "0x0bdc" ).toUShort( 0, 0 ); - mAIMVersion.other = config.readEntry( "Other", "0x000000d2" ).toUInt( 0, 0 ); - mAIMVersion.country = config.readEntry( "Country", "us" ); - mAIMVersion.lang = config.readEntry( "Lang", "en" ); -} - void OscarVersionUpdater::printDebug() { - kdDebug(OSCAR_RAW_DEBUG) << "*************** AIM VERSION INFO ***************" << endl; - kdDebug(OSCAR_RAW_DEBUG) << "client string: " << mAIMVersion.clientString << endl; - kdDebug(OSCAR_RAW_DEBUG) << "client id: " << QString::number( mAIMVersion.clientId, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "major: " << QString::number( mAIMVersion.major, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "minor: " << QString::number( mAIMVersion.minor, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "point: " << QString::number( mAIMVersion.point, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "build: " << QString::number( mAIMVersion.build, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "other: " << QString::number( mAIMVersion.other, 16 ) << endl; - kdDebug(OSCAR_RAW_DEBUG) << "country: " << mAIMVersion.country << endl; - kdDebug(OSCAR_RAW_DEBUG) << "lang: " << mAIMVersion.lang << endl; - kdDebug(OSCAR_RAW_DEBUG) << "************************************************" << endl; - kdDebug(OSCAR_RAW_DEBUG) << "*************** ICQ VERSION INFO ***************" << endl; kdDebug(OSCAR_RAW_DEBUG) << "client string: " << mICQVersion.clientString << endl; kdDebug(OSCAR_RAW_DEBUG) << "client id: " << QString::number( mICQVersion.clientId, 16 ) << endl; @@ -169,7 +139,6 @@ if ( doc.setContent ( mVersionData ) ) { Oscar::ClientVersion tmpICQ = mICQVersion; - Oscar::ClientVersion tmpAIM = mAIMVersion; parseDocument( doc ); @@ -178,12 +147,6 @@ storeVersionInfo( "ICQVersion", mICQVersion ); bUpdate = true; } - - if ( !equal( tmpAIM, mAIMVersion ) ) - { - storeVersionInfo( "AIMVersion", mAIMVersion ); - bUpdate = true; - } } } @@ -211,8 +174,6 @@ { if ( versionElement.tagName() == "icq" ) parseVersion( mICQVersion, versionElement ); - else if ( versionElement.tagName() == "aim" ) - parseVersion( mAIMVersion, versionElement ); versionElement = versionElement.nextSibling().toElement(); } diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscarversionupdater.h kdenetwork-3.5.10/kopete/protocols/oscar/oscarversionupdater.h --- kdenetwork-3.5.10_orig/kopete/protocols/oscar/oscarversionupdater.h 2006-10-01 17:26:54.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/oscar/oscarversionupdater.h 2018-04-27 05:08:41.321197242 +0000 @@ -63,22 +63,11 @@ const Oscar::ClientVersion* getICQVersion() const { return &mICQVersion; } /** - * Return structure with version info for AIM. - * @return Oscar::ClientVersion. - */ - const Oscar::ClientVersion* getAIMVersion() const { return &mAIMVersion; } - - /** * Set structure with ICQ version info to default. */ void initICQVersionInfo(); /** - * Set structure with AIM version info to default. - */ - void initAIMVersionInfo(); - - /** * Print debug info. */ void printDebug(); @@ -108,7 +97,6 @@ static OscarVersionUpdater *versionUpdaterStatic; Oscar::ClientVersion mICQVersion; - Oscar::ClientVersion mAIMVersion; KIO::TransferJob *mTransferJob; QByteArray mVersionData; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/yahoo/libkyahoo/yabentry.cpp kdenetwork-3.5.10/kopete/protocols/yahoo/libkyahoo/yabentry.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/yahoo/libkyahoo/yabentry.cpp 2018-04-26 08:58:22.665630474 +0000 +++ kdenetwork-3.5.10/kopete/protocols/yahoo/libkyahoo/yabentry.cpp 2018-04-26 09:11:43.460160709 +0000 @@ -56,7 +56,6 @@ additional3 = e.attribute("c3"); additional4 = e.attribute("c4"); notes = e.attribute("cm").replace( "
", "\n" ); - imAIM = e.attribute("ima"); imGoogleTalk = e.attribute("img"); imICQ = e.attribute("imq"); imIRC = e.attribute("imc"); @@ -106,7 +105,6 @@ additional3 = d.elementsByTagName("c3").item(0).toElement().text(); additional4 = d.elementsByTagName("c4").item(0).toElement().text(); notes = d.elementsByTagName("cm").item(0).toElement().text().replace( "
", "\n" ); - imAIM = d.elementsByTagName("ima").item(0).toElement().text(); imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text(); imICQ = d.elementsByTagName("imq").item(0).toElement().text(); imIRC = d.elementsByTagName("imc").item(0).toElement().text(); @@ -153,7 +151,6 @@ e.setAttribute( "c3", additional3 ); e.setAttribute( "c4", additional4 ); e.setAttribute( "cm", QString( notes ).replace( '\n', "
" ) ); - e.setAttribute( "ima", imAIM ); e.setAttribute( "img", imGoogleTalk ); e.setAttribute( "imq", imICQ ); e.setAttribute( "imc", imIRC ); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/yahoo/libkyahoo/yabentry.h kdenetwork-3.5.10/kopete/protocols/yahoo/libkyahoo/yabentry.h --- kdenetwork-3.5.10_orig/kopete/protocols/yahoo/libkyahoo/yabentry.h 2018-04-26 08:58:22.665630474 +0000 +++ kdenetwork-3.5.10/kopete/protocols/yahoo/libkyahoo/yabentry.h 2018-04-26 09:11:52.128058892 +0000 @@ -44,7 +44,6 @@ QString additionalNumber; QString altEmail1; QString altEmail2; - QString imAIM; QString imICQ; QString imMSN; QString imGoogleTalk; diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp kdenetwork-3.5.10/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp 2006-10-01 17:26:36.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp 2018-04-26 09:12:20.383726638 +0000 @@ -116,7 +116,6 @@ entry.additional3 = m_otherInfoWidget->note3Edit->text(); entry.additional4 = m_otherInfoWidget->note4Edit->text(); entry.notes = m_otherInfoWidget->commentsEdit->text(); -// entry.imAIM = m_genInfoWidget->firstNameEdit->text(); // entry.imGoogleTalk = m_genInfoWidget->firstNameEdit->text(); // entry.imICQ = m_genInfoWidget->firstNameEdit->text(); // entry.imIRC = m_genInfoWidget->firstNameEdit->text(); @@ -187,7 +186,6 @@ entry.additional3 = m_otherInfoWidget->note3Edit->text().isEmpty() ? oldEntry->additional3 : m_otherInfoWidget->note3Edit->text(); entry.additional4 = m_otherInfoWidget->note4Edit->text().isEmpty() ? oldEntry->additional4 : m_otherInfoWidget->note4Edit->text(); entry.notes = m_otherInfoWidget->commentsEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); - // entry.imAIM = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); // entry.imGoogleTalk = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); // entry.imICQ = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); // entry.imIRC = m_genInfoWidget->firstNameEdit->text().isEmpty() ? oldEntry->notes : m_otherInfoWidget->commentsEdit->text(); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/yahoo/yahoocontact.cpp kdenetwork-3.5.10/kopete/protocols/yahoo/yahoocontact.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/yahoo/yahoocontact.cpp 2018-04-26 08:58:22.673630376 +0000 +++ kdenetwork-3.5.10/kopete/protocols/yahoo/yahoocontact.cpp 2018-04-26 09:12:50.219375267 +0000 @@ -735,7 +735,6 @@ setProperty( YahooProtocol::protocol()->propAdditionalNumber, m_YABEntry->additionalNumber ); setProperty( YahooProtocol::protocol()->propAltEmail1, m_YABEntry->altEmail1 ); setProperty( YahooProtocol::protocol()->propAltEmail2, m_YABEntry->altEmail2 ); - setProperty( YahooProtocol::protocol()->propImAIM, m_YABEntry->imAIM ); setProperty( YahooProtocol::protocol()->propImICQ, m_YABEntry->imICQ ); setProperty( YahooProtocol::protocol()->propImMSN, m_YABEntry->imMSN ); setProperty( YahooProtocol::protocol()->propImGoogleTalk, m_YABEntry->imGoogleTalk ); @@ -798,7 +797,6 @@ m_YABEntry->additionalNumber = property( YahooProtocol::protocol()->propAdditionalNumber ).value().toString(); m_YABEntry->altEmail1 = property( YahooProtocol::protocol()->propAltEmail1 ).value().toString(); m_YABEntry->altEmail2 = property( YahooProtocol::protocol()->propAltEmail2 ).value().toString(); - m_YABEntry->imAIM = property( YahooProtocol::protocol()->propImAIM ).value().toString(); m_YABEntry->imICQ = property( YahooProtocol::protocol()->propImICQ ).value().toString(); m_YABEntry->imMSN = property( YahooProtocol::protocol()->propImMSN ).value().toString(); m_YABEntry->imGoogleTalk = property( YahooProtocol::protocol()->propImGoogleTalk ).value().toString(); diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/yahoo/yahooprotocol.cpp kdenetwork-3.5.10/kopete/protocols/yahoo/yahooprotocol.cpp --- kdenetwork-3.5.10_orig/kopete/protocols/yahoo/yahooprotocol.cpp 2006-10-01 17:26:36.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/yahoo/yahooprotocol.cpp 2018-04-26 09:13:08.891155096 +0000 @@ -71,7 +71,6 @@ propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), QString::null, true, false), propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), QString::null, true, false), propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), QString::null, true, false), - propImAIM("YABIMAIM", i18n("AIM"), QString::null, true, false), propImICQ("YABIMICQ", i18n("ICQ"), QString::null, true, false), propImMSN("YABIMMSN", i18n("MSN"), QString::null, true, false), propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), QString::null, true, false), diff -Naru kdenetwork-3.5.10_orig/kopete/protocols/yahoo/yahooprotocol.h kdenetwork-3.5.10/kopete/protocols/yahoo/yahooprotocol.h --- kdenetwork-3.5.10_orig/kopete/protocols/yahoo/yahooprotocol.h 2006-10-01 17:26:36.000000000 +0000 +++ kdenetwork-3.5.10/kopete/protocols/yahoo/yahooprotocol.h 2018-04-26 09:13:15.707074674 +0000 @@ -86,7 +86,6 @@ const Kopete::ContactPropertyTmpl propAdditionalNumber; const Kopete::ContactPropertyTmpl propAltEmail1; const Kopete::ContactPropertyTmpl propAltEmail2; - const Kopete::ContactPropertyTmpl propImAIM; const Kopete::ContactPropertyTmpl propImICQ; const Kopete::ContactPropertyTmpl propImMSN; const Kopete::ContactPropertyTmpl propImGoogleTalk;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
