diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-12-10 01:24:17 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-12-10 01:24:17 +0100 |
| commit | 91ba38a1df42b56caa73babc90ffa4f674c000d4 (patch) | |
| tree | cb65a7a13ac72de8a4ef610424da9195edca0a0c /kopete/kopete | |
| parent | f2553c2ff47de1bcf060f22edd5c23d9cb653bc3 (diff) | |
| download | tdenetwork-91ba38a1df42b56caa73babc90ffa4f674c000d4.tar.gz tdenetwork-91ba38a1df42b56caa73babc90ffa4f674c000d4.zip | |
kopete: Restore the AIM protocol because a replacement AIM server was created.
This reverts commits 036b0229db and dc34f9c391.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kopete/kopete')
| -rw-r--r-- | kopete/kopete/kimiface.h | 8 | ||||
| -rw-r--r-- | kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp | 7 | ||||
| -rwxr-xr-x | kopete/kopete/tdeconf_update/kopete-pluginloader.pl | 1 |
3 files changed, 10 insertions, 6 deletions
diff --git a/kopete/kopete/kimiface.h b/kopete/kopete/kimiface.h index 8d00c0b0..970d9698 100644 --- a/kopete/kopete/kimiface.h +++ b/kopete/kopete/kimiface.h @@ -106,8 +106,8 @@ k_dcop: /** * 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, nick for IRC. - * @param protocol the protocol, eg one of "ICQProtocol", + * @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", "ICQProtocol", * @return a KABC uid or null if none found/ */ virtual TQString locate( const TQString & contactId, const TQString & protocol ) = 0; @@ -166,8 +166,8 @@ k_dcop: // Contact list /** * Add a contact to the contact list - * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, nick for IRC. - * @param protocol the protocol, eg one of "ICQProtocol",... + * @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", "ICQProtocol", ... * @return whether the add succeeded. False may signal already present, protocol not supported, or add operation not supported. */ virtual bool addContact( const TQString &contactId, const TQString &protocol ) = 0; diff --git a/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp index d1de27f2..67b39ad8 100644 --- a/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp +++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp @@ -55,12 +55,15 @@ void parseGroup( const TQString &group, const TQString &rawLine ) { // Groups that are converted can almost certainly be removed entirely - if ( group == "ICQ" || group == "Gadu" || group == "Jabber" || group == "IRC" ) + if ( group == "ICQ" || group == "Oscar" || group == "Gadu" || group == "Jabber" || group == "IRC" ) { accountId = "EMPTY"; autoConnect = "true"; - protocol = group + "Protocol"; + if ( group == "Oscar" ) + protocol = "AIMProtocol"; + else + protocol = group + "Protocol"; password = TQString(); pluginData.clear(); diff --git a/kopete/kopete/tdeconf_update/kopete-pluginloader.pl b/kopete/kopete/tdeconf_update/kopete-pluginloader.pl index 94d1d4f9..19709d3a 100755 --- a/kopete/kopete/tdeconf_update/kopete-pluginloader.pl +++ b/kopete/kopete/tdeconf_update/kopete-pluginloader.pl @@ -16,6 +16,7 @@ while( my $line = <> ) $moduleLine =~ s/^Modules/Plugins/; $moduleLine =~ s/\.plugin/\.desktop/g; +$moduleLine =~ s/oscar/aim/; if ( $logging == "true" ) { chomp $moduleLine; |