From b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:58 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kopete/protocols/gadu/gaduaccount.cpp | 4 +- kopete/protocols/gadu/gaduaccount.h | 2 +- kopete/protocols/gadu/gaducontact.cpp | 2 +- kopete/protocols/gadu/gaduprotocol.cpp | 2 +- kopete/protocols/groupwise/gwaccount.cpp | 2 +- .../protocols/groupwise/ui/gweditaccountwidget.cpp | 2 +- .../groupwise/ui/gwreceiveinvitationdialog.cpp | 2 +- kopete/protocols/irc/ircaccount.cpp | 2 +- kopete/protocols/irc/irccontactmanager.cpp | 4 +- kopete/protocols/irc/ircprotocol.cpp | 2 +- kopete/protocols/irc/ircusercontact.cpp | 2 +- kopete/protocols/irc/libkirc/kircengine.cpp | 2 +- kopete/protocols/irc/libkirc/ksslsocket.cpp | 12 +- kopete/protocols/irc/libkirc/ksslsocket.h | 2 +- kopete/protocols/irc/ui/CMakeLists.txt | 2 +- kopete/protocols/irc/ui/Makefile.am | 2 +- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 2 +- kopete/protocols/irc/ui/networkconfig.ui | 382 -------------------- kopete/protocols/irc/ui/networkconfig.ui.h | 26 -- kopete/protocols/irc/ui/networtdeconfig.ui | 382 ++++++++++++++++++++ kopete/protocols/irc/ui/networtdeconfig.ui.h | 26 ++ kopete/protocols/jabber/CMakeLists.txt | 2 +- kopete/protocols/jabber/Makefile.am | 2 +- kopete/protocols/jabber/jabberaccount.cpp | 2 +- kopete/protocols/jabber/jabberbasecontact.cpp | 2 +- kopete/protocols/jabber/jabberchatsession.cpp | 4 +- kopete/protocols/jabber/jabbercontact.cpp | 4 +- kopete/protocols/jabber/jabberfiletransfer.cpp | 2 +- kopete/protocols/jabber/jabbergroupcontact.cpp | 2 +- .../protocols/jabber/jabbergroupmembercontact.cpp | 2 +- kopete/protocols/jabber/jabberprotocol.cpp | 2 +- kopete/protocols/jabber/jabbertransport.cpp | 2 +- kopete/protocols/jabber/kioslave/CMakeLists.txt | 42 --- kopete/protocols/jabber/kioslave/Makefile.am | 25 -- kopete/protocols/jabber/kioslave/jabberdisco.cpp | 399 --------------------- kopete/protocols/jabber/kioslave/jabberdisco.h | 83 ----- .../protocols/jabber/kioslave/jabberdisco.protocol | 53 --- kopete/protocols/jabber/tdeioslave/CMakeLists.txt | 42 +++ kopete/protocols/jabber/tdeioslave/Makefile.am | 25 ++ kopete/protocols/jabber/tdeioslave/jabberdisco.cpp | 399 +++++++++++++++++++++ kopete/protocols/jabber/tdeioslave/jabberdisco.h | 83 +++++ .../jabber/tdeioslave/jabberdisco.protocol | 53 +++ kopete/protocols/jabber/ui/dlgjabbervcard.cpp | 4 +- kopete/protocols/jabber/ui/jabberchooseserver.cpp | 6 +- .../jabber/ui/jabbereditaccountwidget.cpp | 2 +- kopete/protocols/meanwhile/meanwhileaccount.cpp | 2 +- kopete/protocols/msn/config/CMakeLists.txt | 2 +- kopete/protocols/msn/config/Makefile.am | 2 +- kopete/protocols/msn/msnaccount.cpp | 2 +- kopete/protocols/msn/msnchatsession.cpp | 2 +- kopete/protocols/msn/msncontact.cpp | 6 +- kopete/protocols/msn/msnfiletransfersocket.cpp | 2 +- kopete/protocols/msn/msnnotifysocket.cpp | 4 +- kopete/protocols/msn/msnprotocol.cpp | 2 +- kopete/protocols/msn/msnsecureloginhandler.cpp | 2 +- kopete/protocols/msn/msnsocket.cpp | 2 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 2 +- kopete/protocols/msn/ui/msneditaccountwidget.cpp | 6 +- kopete/protocols/msn/webcam.cpp | 2 +- kopete/protocols/oscar/aim/aimaccount.cpp | 2 +- .../oscar/aim/ui/aimeditaccountwidget.cpp | 2 +- kopete/protocols/oscar/icq/icqaccount.cpp | 2 +- .../oscar/icq/ui/icqeditaccountwidget.cpp | 2 +- kopete/protocols/oscar/oscaraccount.cpp | 2 +- kopete/protocols/oscar/oscarversionupdater.cpp | 4 +- kopete/protocols/sms/services/gsmlib.cpp | 2 +- kopete/protocols/sms/services/smsclient.cpp | 2 +- kopete/protocols/sms/services/smssend.cpp | 2 +- kopete/protocols/sms/services/smssendprovider.cpp | 2 +- kopete/protocols/sms/smsaccount.cpp | 2 +- kopete/protocols/sms/smscontact.cpp | 2 +- kopete/protocols/sms/smseditaccountwidget.cpp | 2 +- kopete/protocols/sms/smsprotocol.cpp | 2 +- .../protocols/winpopup/libwinpopup/libwinpopup.h | 2 +- kopete/protocols/winpopup/wpaccount.cpp | 2 +- kopete/protocols/winpopup/wpeditaccount.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/logintask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp | 6 +- .../protocols/yahoo/libkyahoo/receivefiletask.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp | 2 +- .../protocols/yahoo/libkyahoo/sendpicturetask.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/yabtask.cpp | 6 +- .../yahoo/libkyahoo/yahoobuddyiconloader.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp | 6 +- kopete/protocols/yahoo/yahooaccount.cpp | 2 +- kopete/protocols/yahoo/yahoochatsession.cpp | 2 +- .../yahoo/yahooconferencemessagemanager.cpp | 2 +- kopete/protocols/yahoo/yahoocontact.cpp | 8 +- kopete/protocols/yahoo/yahooeditaccount.cpp | 4 +- kopete/protocols/yahoo/yahooverifyaccount.cpp | 6 +- 90 files changed, 1122 insertions(+), 1122 deletions(-) delete mode 100644 kopete/protocols/irc/ui/networkconfig.ui delete mode 100644 kopete/protocols/irc/ui/networkconfig.ui.h create mode 100644 kopete/protocols/irc/ui/networtdeconfig.ui create mode 100644 kopete/protocols/irc/ui/networtdeconfig.ui.h delete mode 100644 kopete/protocols/jabber/kioslave/CMakeLists.txt delete mode 100644 kopete/protocols/jabber/kioslave/Makefile.am delete mode 100644 kopete/protocols/jabber/kioslave/jabberdisco.cpp delete mode 100644 kopete/protocols/jabber/kioslave/jabberdisco.h delete mode 100644 kopete/protocols/jabber/kioslave/jabberdisco.protocol create mode 100644 kopete/protocols/jabber/tdeioslave/CMakeLists.txt create mode 100644 kopete/protocols/jabber/tdeioslave/Makefile.am create mode 100644 kopete/protocols/jabber/tdeioslave/jabberdisco.cpp create mode 100644 kopete/protocols/jabber/tdeioslave/jabberdisco.h create mode 100644 kopete/protocols/jabber/tdeioslave/jabberdisco.protocol (limited to 'kopete/protocols') diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index c60f4051..f9a725ee 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -37,14 +37,14 @@ #include "kopeteglobal.h" #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index 1ba9a5c2..dd3f6c68 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include class GaduAccountPrivate; diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index c9a68f25..9aea8fe5 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "gaduaccount.h" diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp index 3ec773f0..4f77017a 100644 --- a/kopete/protocols/gadu/gaduprotocol.cpp +++ b/kopete/protocols/gadu/gaduprotocol.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index 40d04a3e..51be07e1 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index de50ba19..910c99f4 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index d4c65412..4c51487f 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 46e325ac..7daf2f8d 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index 84c88f39..10ae8a69 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include @@ -67,7 +67,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* ))); socketTimeout = 15000; - TQString timeoutPath = locate( "config", "kioslaverc" ); + TQString timeoutPath = locate( "config", "tdeioslaverc" ); if( !timeoutPath.isEmpty() ) { TDEConfig config( timeoutPath ); diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 96d905c0..e2d359dd 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -23,7 +23,7 @@ #include "ircchannelcontact.h" #include "irccontactmanager.h" -#include "networkconfig.h" +#include "networtdeconfig.h" #include "channellist.h" #include "ircguiclient.h" #include "ircusercontact.h" diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 54c40132..fa2ae7b5 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 0fddaab7..79bc56df 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -24,7 +24,7 @@ #include "kircengine.h" #include "ksslsocket.h" -#include +#include #include #include #include diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index 5db30998..d3615fc5 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -184,16 +184,16 @@ void KSSLSocket::showInfoDialog() { if( socketStatus() == connected ) { - if (!d->dcc->isApplicationRegistered("kio_uiserver")) + if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) { - TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList()); + TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList()); } TQByteArray data, ignore; TQCString ignoretype; TQDataStream arg(data, IO_WriteOnly); arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData; - d->dcc->call("kio_uiserver", "UIServer", + d->dcc->call("tdeio_uiserver", "UIServer", "showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore); } } @@ -233,12 +233,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin TQDataStream arg(data, IO_WriteOnly); arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo; - if (!d->dcc->isApplicationRegistered("kio_uiserver")) + if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) { - TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList()); + TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList()); } - d->dcc->call("kio_uiserver", "UIServer", + d->dcc->call("tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result); if( returnType == "int" ) diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h index a036a71d..f0b8e76c 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.h +++ b/kopete/protocols/irc/libkirc/ksslsocket.h @@ -22,7 +22,7 @@ #include #include -#include +#include class KSSLSocketPrivate; diff --git a/kopete/protocols/irc/ui/CMakeLists.txt b/kopete/protocols/irc/ui/CMakeLists.txt index 7d77d5b8..d90cdd65 100644 --- a/kopete/protocols/irc/ui/CMakeLists.txt +++ b/kopete/protocols/irc/ui/CMakeLists.txt @@ -26,5 +26,5 @@ include_directories( tde_add_library( kopeteircui STATIC_PIC AUTOMOC SOURCES ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui - channellist.cpp channellistdialog.cpp networkconfig.ui + channellist.cpp channellistdialog.cpp networtdeconfig.ui ) diff --git a/kopete/protocols/irc/ui/Makefile.am b/kopete/protocols/irc/ui/Makefile.am index 854a7398..b31b75ea 100644 --- a/kopete/protocols/irc/ui/Makefile.am +++ b/kopete/protocols/irc/ui/Makefile.am @@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \ libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \ - irceditaccount.ui channellist.cpp channellistdialog.cpp networkconfig.ui + irceditaccount.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index f09ea21e..430282fb 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui deleted file mode 100644 index 09121e54..00000000 --- a/kopete/protocols/irc/ui/networkconfig.ui +++ /dev/null @@ -1,382 +0,0 @@ - -NetworkConfig - - - NetworkConfig - - - - 0 - 0 - 670 - 468 - - - - Network Configuration - - - - unnamed - - - - description - - - - - textLabel10 - - - - 1 - 5 - 0 - 0 - - - - &Description: - - - description - - - - - groupBox2 - - - - 3 - 3 - 0 - 0 - - - - 4 - - - Host Con&figuration - - - - unnamed - - - - hostList - - - - 3 - 3 - 0 - 0 - - - - The IRC servers associated with this network - - - The IRC servers associated with this network. Use the up and down buttons to alter the order in which connections are attempted. - - - - - password - - - Password - - - Most IRC servers do not require a password - - - - - textLabel6 - - - Por&t: - - - port - - - - - port - - - 65536 - - - 1 - - - 6667 - - - - - textLabel4 - - - &Password: - - - password - - - - - textLabel5 - - - &Host: - - - host - - - - - host - - - true - - - - - - - - useSSL - - - Use SS&L - - - Check this to enable SSL for this connection - - - - - removeHost - - - - 1 - 0 - 0 - 0 - - - - &Remove - - - - - newHost - - - - 1 - 0 - 0 - 0 - - - - &New... - - - - - spacer3 - - - Horizontal - - - Expanding - - - - 210 - 20 - - - - - - downButton - - - false - - - Down - - - Move this server down - - - Move this server down in connection attempt priority - - - - - spacer4 - - - Vertical - - - Expanding - - - - 20 - 151 - - - - - - upButton - - - false - - - Up - - - Move this server up - - - Move this server up in connection attempt priority - - - - - - - cancelButton - - - &Cancel - - - - - saveButton - - - &Save - - - - - newNetwork - - - Ne&w - - - - - networkList - - - - 3 - 7 - 0 - 0 - - - - - - spacer5 - - - Horizontal - - - Expanding - - - - 260 - 20 - - - - - - renameNetwork - - - Rena&me... - - - - - removeNetwork - - - Remo&ve - - - - - - - cancelButton - clicked() - NetworkConfig - reject() - - - saveButton - clicked() - NetworkConfig - accept() - - - - networkList - newNetwork - renameNetwork - removeNetwork - description - hostList - upButton - downButton - host - port - password - useSSL - newHost - removeHost - saveButton - cancelButton - - - accepted() - rejected() - - - accept() - reject() - - - diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networkconfig.ui.h deleted file mode 100644 index 183ba57f..00000000 --- a/kopete/protocols/irc/ui/networkconfig.ui.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename functions or slots use -** TQt Designer which will update this file, preserving your code. Create an -** init() function in place of a constructor, and a destroy() function in -** place of a destructor. -*****************************************************************************/ - - - - - - -void NetworkConfig::accept() -{ - emit accepted(); - TQDialog::accept(); -} - - -void NetworkConfig::reject() -{ - emit rejected(); - TQDialog::reject(); -} diff --git a/kopete/protocols/irc/ui/networtdeconfig.ui b/kopete/protocols/irc/ui/networtdeconfig.ui new file mode 100644 index 00000000..09121e54 --- /dev/null +++ b/kopete/protocols/irc/ui/networtdeconfig.ui @@ -0,0 +1,382 @@ + +NetworkConfig + + + NetworkConfig + + + + 0 + 0 + 670 + 468 + + + + Network Configuration + + + + unnamed + + + + description + + + + + textLabel10 + + + + 1 + 5 + 0 + 0 + + + + &Description: + + + description + + + + + groupBox2 + + + + 3 + 3 + 0 + 0 + + + + 4 + + + Host Con&figuration + + + + unnamed + + + + hostList + + + + 3 + 3 + 0 + 0 + + + + The IRC servers associated with this network + + + The IRC servers associated with this network. Use the up and down buttons to alter the order in which connections are attempted. + + + + + password + + + Password + + + Most IRC servers do not require a password + + + + + textLabel6 + + + Por&t: + + + port + + + + + port + + + 65536 + + + 1 + + + 6667 + + + + + textLabel4 + + + &Password: + + + password + + + + + textLabel5 + + + &Host: + + + host + + + + + host + + + true + + + + + + + + useSSL + + + Use SS&L + + + Check this to enable SSL for this connection + + + + + removeHost + + + + 1 + 0 + 0 + 0 + + + + &Remove + + + + + newHost + + + + 1 + 0 + 0 + 0 + + + + &New... + + + + + spacer3 + + + Horizontal + + + Expanding + + + + 210 + 20 + + + + + + downButton + + + false + + + Down + + + Move this server down + + + Move this server down in connection attempt priority + + + + + spacer4 + + + Vertical + + + Expanding + + + + 20 + 151 + + + + + + upButton + + + false + + + Up + + + Move this server up + + + Move this server up in connection attempt priority + + + + + + + cancelButton + + + &Cancel + + + + + saveButton + + + &Save + + + + + newNetwork + + + Ne&w + + + + + networkList + + + + 3 + 7 + 0 + 0 + + + + + + spacer5 + + + Horizontal + + + Expanding + + + + 260 + 20 + + + + + + renameNetwork + + + Rena&me... + + + + + removeNetwork + + + Remo&ve + + + + + + + cancelButton + clicked() + NetworkConfig + reject() + + + saveButton + clicked() + NetworkConfig + accept() + + + + networkList + newNetwork + renameNetwork + removeNetwork + description + hostList + upButton + downButton + host + port + password + useSSL + newHost + removeHost + saveButton + cancelButton + + + accepted() + rejected() + + + accept() + reject() + + + diff --git a/kopete/protocols/irc/ui/networtdeconfig.ui.h b/kopete/protocols/irc/ui/networtdeconfig.ui.h new file mode 100644 index 00000000..183ba57f --- /dev/null +++ b/kopete/protocols/irc/ui/networtdeconfig.ui.h @@ -0,0 +1,26 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. +** +** If you wish to add, delete or rename functions or slots use +** TQt Designer which will update this file, preserving your code. Create an +** init() function in place of a constructor, and a destroy() function in +** place of a destructor. +*****************************************************************************/ + + + + + + +void NetworkConfig::accept() +{ + emit accepted(); + TQDialog::accept(); +} + + +void NetworkConfig::reject() +{ + emit rejected(); + TQDialog::reject(); +} diff --git a/kopete/protocols/jabber/CMakeLists.txt b/kopete/protocols/jabber/CMakeLists.txt index a5e53af2..61202e95 100644 --- a/kopete/protocols/jabber/CMakeLists.txt +++ b/kopete/protocols/jabber/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( ui ) add_subdirectory( icons ) add_subdirectory( libiris ) -add_subdirectory( kioslave ) +add_subdirectory( tdeioslave ) if( WITH_JINGLE ) add_subdirectory( jingle ) diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am index f1706949..34337e63 100644 --- a/kopete/protocols/jabber/Makefile.am +++ b/kopete/protocols/jabber/Makefile.am @@ -5,7 +5,7 @@ JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jin endif METASOURCES = AUTO -SUBDIRS = ui icons libiris $(JINGLE) . kioslave +SUBDIRS = ui icons libiris $(JINGLE) . tdeioslave AM_CPPFLAGS = $(KOPETE_INCLUDES) \ -I$(srcdir)/libiris/iris/include \ -I$(srcdir)/libiris/iris/xmpp-im \ diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 0a803927..23f947fc 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index d994487f..ec4b869f 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 75bcdd03..cbfc0eab 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include "kopetechatsessionmanager.h" @@ -38,7 +38,7 @@ #include "jabbercontact.h" #include "jabberresource.h" #include "jabberresourcepool.h" -#include "kioslave/jabberdisco.h" +#include "tdeioslave/jabberdisco.h" JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 58ca2409..1d7d2e3f 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -31,11 +31,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index 00ecd535..e60116e5 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -21,7 +21,7 @@ #include "jabberfiletransfer.h" #include #include -#include +#include #include "kopeteuiglobal.h" #include "kopetemetacontact.h" #include "kopetecontactlist.h" diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 1fa6d884..96ab9bcd 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "jabberprotocol.h" #include "jabberaccount.h" diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index e9bae4c1..e1bbd04a 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "jabberprotocol.h" #include "jabberaccount.h" #include "jabberfiletransfer.h" diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index a7cf3a78..9e9cdc9a 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 26d16b28..adc53b01 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "xmpp_tasks.h" diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt deleted file mode 100644 index 24b4ce81..00000000 --- a/kopete/protocols/jabber/kioslave/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/include - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/jabber - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/cutestuff/util - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) - - -##### kio_jabberdisco (module) ################## - -tde_add_kpart( kio_jabberdisco AUTOMOC - SOURCES jabberdisco.cpp - LINK - jabberclient-static - iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static - qca-static cutestuff_network-static cutestuff_util-static kio-shared idn - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/kopete/protocols/jabber/kioslave/Makefile.am b/kopete/protocols/jabber/kioslave/Makefile.am deleted file mode 100644 index be3b2112..00000000 --- a/kopete/protocols/jabber/kioslave/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -METASOURCES = AUTO - -INCLUDES = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../libiris/iris/include \ - -I$(srcdir)/../libiris/iris/xmpp-im \ - -I$(srcdir)/../libiris/iris/jabber \ - -I$(srcdir)/../libiris/qca/src \ - -I$(srcdir)/../libiris/cutestuff/util \ - -I$(srcdir)/../libiris/cutestuff/network \ - $(all_includes) - -kde_module_LTLIBRARIES = kio_jabberdisco.la - -kio_jabberdisco_la_SOURCES = jabberdisco.cpp -kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) -kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor - -noinst_HEADERS = jabberdisco.h - -protocol_DATA = jabberdisco.protocol -protocoldir = $(kde_servicesdir) - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_jabberdisco.pot diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp deleted file mode 100644 index 311cfafd..00000000 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ /dev/null @@ -1,399 +0,0 @@ - -/*************************************************************************** - Jabber Service Discovery KIO Slave - ------------------- - begin : Wed June 1 2005 - copyright : (C) 2005 by Till Gerken - - Kopete (C) 2001-2005 Kopete developers - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include - -#include "jabberdisco.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include "jabberclient.h" - -JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ) - : TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl; - - m_jabberClient = 0l; - m_connected = false; - -} - - -JabberDiscoProtocol::~JabberDiscoProtocol () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave is shutting down." << endl; - - delete m_jabberClient; - -} - -void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << " Host " << host << ", port " << port << ", user " << user << endl; - - m_host = host; - m_port = !port ? 5222 : port; - m_user = TQString(user).replace ( "%", "@" ); - m_password = pass; - -} - -void JabberDiscoProtocol::openConnection () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - if ( m_connected ) - { - return; - } - - // instantiate new client backend or clean up old one - if ( !m_jabberClient ) - { - m_jabberClient = new JabberClient; - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), - this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); - } - else - { - m_jabberClient->disconnect (); - } - - // we need to use the old protocol for now - m_jabberClient->setUseXMPP09 ( true ); - - // set SSL flag (this should be converted to forceTLS when using the new protocol) - m_jabberClient->setUseSSL ( false ); - - // override server and port (this should be dropped when using the new protocol and no direct SSL) - m_jabberClient->setOverrideHost ( true, m_host, m_port ); - - // allow plaintext password authentication or not? - m_jabberClient->setAllowPlainTextPassword ( false ); - - switch ( m_jabberClient->connect ( XMPP::Jid ( m_user + TQString("/") + "JabberBrowser" ), m_password ) ) - { - case JabberClient::NoTLS: - // no SSL support, at the connecting stage this means the problem is client-side - error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); - break; - - case JabberClient::Ok: - default: - // everything alright! - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Waiting for socket to open..." << endl; - break; - } - - connected (); - -} - -void JabberDiscoProtocol::closeConnection () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - if ( m_jabberClient ) - { - m_jabberClient->disconnect (); - } - -} - -void JabberDiscoProtocol::slave_status () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - slaveStatus ( m_host, m_connected ); - -} - -void JabberDiscoProtocol::get ( const KURL &url ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - m_command = Get; - m_url = url; - - mimeType ( "inode/directory" ); - - finished (); - -} - -void JabberDiscoProtocol::listDir ( const KURL &url ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - m_command = ListDir; - m_url = url; - - openConnection (); - -} - -void JabberDiscoProtocol::mimetype ( const KURL &/*url*/ ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - mimeType("inode/directory"); - - finished (); - -} - -void JabberDiscoProtocol::slotClientDebugMessage ( const TQString &msg ) -{ - - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << msg << endl; - -} - -void JabberDiscoProtocol::slotHandleTLSWarning ( int validityResult ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling TLS warning..." << endl; - - if ( messageBox ( TDEIO::SlaveBase::WarningContinueCancel, - i18n ( "The server certificate is invalid. Do you want to continue? " ), - i18n ( "Certificate Warning" ) ) == KMessageBox::Continue ) - { - // resume stream - m_jabberClient->continueAfterTLSWarning (); - } - else - { - // disconnect stream - closeConnection (); - } - -} - -void JabberDiscoProtocol::slotClientError ( JabberClient::ErrorCode errorCode ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling client error..." << endl; - - switch ( errorCode ) - { - case JabberClient::NoTLS: - default: - error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); - closeConnection (); - break; - } - -} - -void JabberDiscoProtocol::slotConnected () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Connected to Jabber server." << endl; - - XMPP::JT_DiscoItems *discoTask; - - m_connected = true; - - // now execute command - switch ( m_command ) - { - case ListDir: // list a directory - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl; - discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () ); - connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) ); - discoTask->get ( m_host ); - discoTask->go ( true ); - break; - - case Get: // retrieve an item - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Retrieving item..." << endl; - break; - - default: // do nothing by default - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Unknown command " << m_command << endl; - break; - } - -} - -void JabberDiscoProtocol::slotQueryFinished () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << "Query task finished" << endl; - - XMPP::JT_DiscoItems * task = (XMPP::JT_DiscoItems *) sender (); - - if (!task->success ()) - { - error ( TDEIO::ERR_COULD_NOT_READ, "" ); - return; - } - - XMPP::DiscoList::const_iterator itemsEnd = task->items().end (); - for (XMPP::DiscoList::const_iterator it = task->items().begin (); it != itemsEnd; ++it) - { - TDEIO::UDSAtom atom; - TDEIO::UDSEntry entry; - - atom.m_uds = TDEIO::UDS_NAME; - atom.m_str = (*it).jid().userHost (); - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_SIZE; - atom.m_long = 0; - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_LINK_DEST; - atom.m_str = (*it).name (); - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_MIME_TYPE; - atom.m_str = "inode/directory"; - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_SIZE; - atom.m_long = 0; - entry.prepend ( atom ); - - listEntry ( entry, false ); - - } - - listEntry ( TDEIO::UDSEntry(), true ); - - finished (); - -} - -void JabberDiscoProtocol::slotCSDisconnected () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Disconnected from Jabber server." << endl; - - /* - * We should delete the JabberClient instance here, - * but timers etc prevent us from doing so. Iris does - * not like to be deleted from a slot. - */ - m_connected = false; - -} - -void JabberDiscoProtocol::slotCSError ( int errorCode ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Error in stream signalled." << endl; - - if ( ( errorCode == XMPP::ClientStream::ErrAuth ) - && ( m_jabberClient->clientStream()->errorCondition () == XMPP::ClientStream::NotAuthorized ) ) - { - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Incorrect password, retrying." << endl; - - TDEIO::AuthInfo authInfo; - authInfo.username = m_user; - authInfo.password = m_password; - if ( openPassDlg ( authInfo, i18n ( "The login details are incorrect. Do you want to try again?" ) ) ) - { - m_user = authInfo.username; - m_password = authInfo.password; - closeConnection (); - openConnection (); - } - else - { - closeConnection (); - error ( TDEIO::ERR_COULD_NOT_AUTHENTICATE, "" ); - } - } - else - { - closeConnection (); - error ( TDEIO::ERR_CONNECTION_BROKEN, "" ); - } - -} - -bool breakEventLoop = false; - -class EventLoopThread : public TQThread -{ -public: - void run (); -}; - -void EventLoopThread::run () -{ - - while ( true ) - { - tqApp->processEvents (); - msleep ( 100 ); - - if ( breakEventLoop ) - break; - } - -} - -void JabberDiscoProtocol::dispatchLoop () -{ - - EventLoopThread eventLoopThread; - - eventLoopThread.start (); - SlaveBase::dispatchLoop (); - breakEventLoop = true; - eventLoopThread.wait (); - -} - -extern "C" -{ - KDE_EXPORT int kdemain(int argc, char **argv); -} - - -int kdemain ( int argc, char **argv ) -{ - TDEApplication app(argc, argv, "kio_jabberdisco", false, true); - - kdDebug(JABBER_DISCO_DEBUG) << k_funcinfo << endl; - - if ( argc != 4 ) - { - kdDebug(JABBER_DISCO_DEBUG) << "Usage: kio_jabberdisco protocol domain-socket1 domain-socket2" << endl; - exit(-1); - } - - JabberDiscoProtocol slave ( argv[2], argv[3] ); - slave.dispatchLoop (); - - return 0; -} - -#include "jabberdisco.moc" diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h deleted file mode 100644 index 660ba269..00000000 --- a/kopete/protocols/jabber/kioslave/jabberdisco.h +++ /dev/null @@ -1,83 +0,0 @@ - -/*************************************************************************** - Jabber Service Discovery KIO Slave - ------------------- - begin : Wed June 1 2005 - copyright : (C) 2005 by Till Gerken - - Kopete (C) 2001-2005 Kopete developers - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef _JABBERDISCO_H_ -#define _JABBERDISCO_H_ - -#include -#include -#include - -#include -#include -#include -#include - -#define JABBER_DISCO_DEBUG 0 - -class JabberClient; - -class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase -{ - -Q_OBJECT - - -public: - JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); - virtual ~JabberDiscoProtocol (); - - void setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ); - - void openConnection (); - void closeConnection (); - - void slave_status (); - - void get ( const KURL &url ); - void listDir ( const KURL &url ); - void mimetype ( const KURL &url ); - - void dispatchLoop (); - -private slots: - void slotClientDebugMessage ( const TQString &msg ); - void slotHandleTLSWarning ( int validityResult ); - void slotClientError ( JabberClient::ErrorCode errorCode ); - void slotConnected (); - void slotCSDisconnected (); - void slotCSError ( int error ); - - void slotQueryFinished (); - -private: - enum CommandType { Get, ListDir }; - - TQString m_host, m_user, m_password; - int m_port; - KURL m_url; - bool m_connected; - - CommandType m_command; - - JabberClient *m_jabberClient; - -}; - -#endif diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.protocol b/kopete/protocols/jabber/kioslave/jabberdisco.protocol deleted file mode 100644 index 01237e73..00000000 --- a/kopete/protocols/jabber/kioslave/jabberdisco.protocol +++ /dev/null @@ -1,53 +0,0 @@ -[Protocol] -exec=kio_jabberdisco -protocol=jabber -input=none -output=filesystem -reading=true -writing=false -makedir=false -linking=false -moving=false -Icon=remote -Description=A KIO slave for Jabber Service Discovery -Description[be]=Модуль kioslave для пошуку сервісаў Jabber -Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ -Description[bs]=KIO slave za otkrivanje Jabber servisa -Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber -Description[cs]=Pomocný protokol pro zjišťování služeb Jabber -Description[da]=En kioslave til at opdage jabber service -Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten -Description[el]=Ένα kioslave για την ανίχνευση υπηρεσίας Jabber -Description[es]=Un «kioslave» para el servicio de descubrimiento jabber -Description[et]=Jabberi teenuste tuvastamise KIO-moodul -Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat -Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber -Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber -Description[gl]=Un KIO slave para Jabber Service Discovery -Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához -Description[is]=kioslave fyrir Jabber þjónustu uppgötvun -Description[it]=Un KIO slave per il servizio di discovery per Jabber -Description[ja]=Jabber Service Discovery の KIO スレーブ -Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის -Description[kk]=Jabber қызметін байқау KIO slave қызметі -Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber -Description[lt]=Priedas (kioslave) FISH protokolui -Description[nb]=En kioslave for Jabber tjenestesøk -Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten -Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ -Description[nl]=Een kioslave voor Jabber Service Discovery -Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging -Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery) -Description[pt]=Um 'kioslave' para a Descoberta de Serviços do Jabber -Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber -Description[ru]=Обработчик KIO для обнаружения служб Jabber -Description[sk]=KIO otrok pre Jabber Service Discovery -Description[sl]=KIO slave za odkrivanje storitev za Jabber -Description[sr]=KIO слуга за Jabber Service Discovery -Description[sr@Latn]=KIO sluga za Jabber Service Discovery -Description[sv]=En I/O-slav för Jabber tjänstupptäckt -Description[tr]=Jabber Servis Bulucu için KIOSlave -Description[uk]=Підлеглий В/В для виявлення служби Jabber -Description[zh_CN]=Jabber 服务发现的 KIO slave -Description[zh_HK]=用於發現 Jabber 服務的 KIO slave -Description[zh_TW]=Jabber 服務的 kioslave diff --git a/kopete/protocols/jabber/tdeioslave/CMakeLists.txt b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt new file mode 100644 index 00000000..aaf788bd --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt @@ -0,0 +1,42 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/include + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/jabber + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/cutestuff/util + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) + + +##### kio_jabberdisco (module) ################## + +tde_add_kpart( kio_jabberdisco AUTOMOC + SOURCES jabberdisco.cpp + LINK + jabberclient-static + iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static + qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kopete/protocols/jabber/tdeioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am new file mode 100644 index 00000000..f8b9c651 --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/Makefile.am @@ -0,0 +1,25 @@ +METASOURCES = AUTO + +INCLUDES = \ + -I$(srcdir)/.. \ + -I$(srcdir)/../libiris/iris/include \ + -I$(srcdir)/../libiris/iris/xmpp-im \ + -I$(srcdir)/../libiris/iris/jabber \ + -I$(srcdir)/../libiris/qca/src \ + -I$(srcdir)/../libiris/cutestuff/util \ + -I$(srcdir)/../libiris/cutestuff/network \ + $(all_includes) + +kde_module_LTLIBRARIES = kio_jabberdisco.la + +kio_jabberdisco_la_SOURCES = jabberdisco.cpp +kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) +kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor + +noinst_HEADERS = jabberdisco.h + +protocol_DATA = jabberdisco.protocol +protocoldir = $(kde_servicesdir) + +messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/tdeio_jabberdisco.pot diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp new file mode 100644 index 00000000..311cfafd --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp @@ -0,0 +1,399 @@ + +/*************************************************************************** + Jabber Service Discovery KIO Slave + ------------------- + begin : Wed June 1 2005 + copyright : (C) 2005 by Till Gerken + + Kopete (C) 2001-2005 Kopete developers + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#include + +#include "jabberdisco.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include "jabberclient.h" + +JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ) + : TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl; + + m_jabberClient = 0l; + m_connected = false; + +} + + +JabberDiscoProtocol::~JabberDiscoProtocol () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave is shutting down." << endl; + + delete m_jabberClient; + +} + +void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << " Host " << host << ", port " << port << ", user " << user << endl; + + m_host = host; + m_port = !port ? 5222 : port; + m_user = TQString(user).replace ( "%", "@" ); + m_password = pass; + +} + +void JabberDiscoProtocol::openConnection () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + if ( m_connected ) + { + return; + } + + // instantiate new client backend or clean up old one + if ( !m_jabberClient ) + { + m_jabberClient = new JabberClient; + + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); + + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), + this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); + } + else + { + m_jabberClient->disconnect (); + } + + // we need to use the old protocol for now + m_jabberClient->setUseXMPP09 ( true ); + + // set SSL flag (this should be converted to forceTLS when using the new protocol) + m_jabberClient->setUseSSL ( false ); + + // override server and port (this should be dropped when using the new protocol and no direct SSL) + m_jabberClient->setOverrideHost ( true, m_host, m_port ); + + // allow plaintext password authentication or not? + m_jabberClient->setAllowPlainTextPassword ( false ); + + switch ( m_jabberClient->connect ( XMPP::Jid ( m_user + TQString("/") + "JabberBrowser" ), m_password ) ) + { + case JabberClient::NoTLS: + // no SSL support, at the connecting stage this means the problem is client-side + error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); + break; + + case JabberClient::Ok: + default: + // everything alright! + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Waiting for socket to open..." << endl; + break; + } + + connected (); + +} + +void JabberDiscoProtocol::closeConnection () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + if ( m_jabberClient ) + { + m_jabberClient->disconnect (); + } + +} + +void JabberDiscoProtocol::slave_status () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + slaveStatus ( m_host, m_connected ); + +} + +void JabberDiscoProtocol::get ( const KURL &url ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + m_command = Get; + m_url = url; + + mimeType ( "inode/directory" ); + + finished (); + +} + +void JabberDiscoProtocol::listDir ( const KURL &url ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + m_command = ListDir; + m_url = url; + + openConnection (); + +} + +void JabberDiscoProtocol::mimetype ( const KURL &/*url*/ ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + mimeType("inode/directory"); + + finished (); + +} + +void JabberDiscoProtocol::slotClientDebugMessage ( const TQString &msg ) +{ + + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << msg << endl; + +} + +void JabberDiscoProtocol::slotHandleTLSWarning ( int validityResult ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling TLS warning..." << endl; + + if ( messageBox ( TDEIO::SlaveBase::WarningContinueCancel, + i18n ( "The server certificate is invalid. Do you want to continue? " ), + i18n ( "Certificate Warning" ) ) == KMessageBox::Continue ) + { + // resume stream + m_jabberClient->continueAfterTLSWarning (); + } + else + { + // disconnect stream + closeConnection (); + } + +} + +void JabberDiscoProtocol::slotClientError ( JabberClient::ErrorCode errorCode ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling client error..." << endl; + + switch ( errorCode ) + { + case JabberClient::NoTLS: + default: + error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); + closeConnection (); + break; + } + +} + +void JabberDiscoProtocol::slotConnected () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Connected to Jabber server." << endl; + + XMPP::JT_DiscoItems *discoTask; + + m_connected = true; + + // now execute command + switch ( m_command ) + { + case ListDir: // list a directory + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl; + discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () ); + connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) ); + discoTask->get ( m_host ); + discoTask->go ( true ); + break; + + case Get: // retrieve an item + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Retrieving item..." << endl; + break; + + default: // do nothing by default + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Unknown command " << m_command << endl; + break; + } + +} + +void JabberDiscoProtocol::slotQueryFinished () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << "Query task finished" << endl; + + XMPP::JT_DiscoItems * task = (XMPP::JT_DiscoItems *) sender (); + + if (!task->success ()) + { + error ( TDEIO::ERR_COULD_NOT_READ, "" ); + return; + } + + XMPP::DiscoList::const_iterator itemsEnd = task->items().end (); + for (XMPP::DiscoList::const_iterator it = task->items().begin (); it != itemsEnd; ++it) + { + TDEIO::UDSAtom atom; + TDEIO::UDSEntry entry; + + atom.m_uds = TDEIO::UDS_NAME; + atom.m_str = (*it).jid().userHost (); + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_SIZE; + atom.m_long = 0; + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_LINK_DEST; + atom.m_str = (*it).name (); + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_MIME_TYPE; + atom.m_str = "inode/directory"; + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_SIZE; + atom.m_long = 0; + entry.prepend ( atom ); + + listEntry ( entry, false ); + + } + + listEntry ( TDEIO::UDSEntry(), true ); + + finished (); + +} + +void JabberDiscoProtocol::slotCSDisconnected () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Disconnected from Jabber server." << endl; + + /* + * We should delete the JabberClient instance here, + * but timers etc prevent us from doing so. Iris does + * not like to be deleted from a slot. + */ + m_connected = false; + +} + +void JabberDiscoProtocol::slotCSError ( int errorCode ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Error in stream signalled." << endl; + + if ( ( errorCode == XMPP::ClientStream::ErrAuth ) + && ( m_jabberClient->clientStream()->errorCondition () == XMPP::ClientStream::NotAuthorized ) ) + { + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Incorrect password, retrying." << endl; + + TDEIO::AuthInfo authInfo; + authInfo.username = m_user; + authInfo.password = m_password; + if ( openPassDlg ( authInfo, i18n ( "The login details are incorrect. Do you want to try again?" ) ) ) + { + m_user = authInfo.username; + m_password = authInfo.password; + closeConnection (); + openConnection (); + } + else + { + closeConnection (); + error ( TDEIO::ERR_COULD_NOT_AUTHENTICATE, "" ); + } + } + else + { + closeConnection (); + error ( TDEIO::ERR_CONNECTION_BROKEN, "" ); + } + +} + +bool breakEventLoop = false; + +class EventLoopThread : public TQThread +{ +public: + void run (); +}; + +void EventLoopThread::run () +{ + + while ( true ) + { + tqApp->processEvents (); + msleep ( 100 ); + + if ( breakEventLoop ) + break; + } + +} + +void JabberDiscoProtocol::dispatchLoop () +{ + + EventLoopThread eventLoopThread; + + eventLoopThread.start (); + SlaveBase::dispatchLoop (); + breakEventLoop = true; + eventLoopThread.wait (); + +} + +extern "C" +{ + KDE_EXPORT int kdemain(int argc, char **argv); +} + + +int kdemain ( int argc, char **argv ) +{ + TDEApplication app(argc, argv, "kio_jabberdisco", false, true); + + kdDebug(JABBER_DISCO_DEBUG) << k_funcinfo << endl; + + if ( argc != 4 ) + { + kdDebug(JABBER_DISCO_DEBUG) << "Usage: kio_jabberdisco protocol domain-socket1 domain-socket2" << endl; + exit(-1); + } + + JabberDiscoProtocol slave ( argv[2], argv[3] ); + slave.dispatchLoop (); + + return 0; +} + +#include "jabberdisco.moc" diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.h b/kopete/protocols/jabber/tdeioslave/jabberdisco.h new file mode 100644 index 00000000..a2bc92a4 --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.h @@ -0,0 +1,83 @@ + +/*************************************************************************** + Jabber Service Discovery KIO Slave + ------------------- + begin : Wed June 1 2005 + copyright : (C) 2005 by Till Gerken + + Kopete (C) 2001-2005 Kopete developers + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef _JABBERDISCO_H_ +#define _JABBERDISCO_H_ + +#include +#include +#include + +#include +#include +#include +#include + +#define JABBER_DISCO_DEBUG 0 + +class JabberClient; + +class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase +{ + +Q_OBJECT + + +public: + JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); + virtual ~JabberDiscoProtocol (); + + void setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ); + + void openConnection (); + void closeConnection (); + + void slave_status (); + + void get ( const KURL &url ); + void listDir ( const KURL &url ); + void mimetype ( const KURL &url ); + + void dispatchLoop (); + +private slots: + void slotClientDebugMessage ( const TQString &msg ); + void slotHandleTLSWarning ( int validityResult ); + void slotClientError ( JabberClient::ErrorCode errorCode ); + void slotConnected (); + void slotCSDisconnected (); + void slotCSError ( int error ); + + void slotQueryFinished (); + +private: + enum CommandType { Get, ListDir }; + + TQString m_host, m_user, m_password; + int m_port; + KURL m_url; + bool m_connected; + + CommandType m_command; + + JabberClient *m_jabberClient; + +}; + +#endif diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol new file mode 100644 index 00000000..fcc0161b --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol @@ -0,0 +1,53 @@ +[Protocol] +exec=kio_jabberdisco +protocol=jabber +input=none +output=filesystem +reading=true +writing=false +makedir=false +linking=false +moving=false +Icon=remote +Description=A KIO slave for Jabber Service Discovery +Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber +Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ +Description[bs]=KIO slave za otkrivanje Jabber servisa +Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber +Description[cs]=Pomocný protokol pro zjišťování služeb Jabber +Description[da]=En tdeioslave til at opdage jabber service +Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten +Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber +Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber +Description[et]=Jabberi teenuste tuvastamise KIO-moodul +Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat +Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber +Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber +Description[gl]=Un KIO slave para Jabber Service Discovery +Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához +Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun +Description[it]=Un KIO slave per il servizio di discovery per Jabber +Description[ja]=Jabber Service Discovery の KIO スレーブ +Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის +Description[kk]=Jabber қызметін байқау KIO slave қызметі +Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber +Description[lt]=Priedas (tdeioslave) FISH protokolui +Description[nb]=En tdeioslave for Jabber tjenestesøk +Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten +Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ +Description[nl]=Een tdeioslave voor Jabber Service Discovery +Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging +Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery) +Description[pt]=Um 'tdeioslave' para a Descoberta de Serviços do Jabber +Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber +Description[ru]=Обработчик KIO для обнаружения служб Jabber +Description[sk]=KIO otrok pre Jabber Service Discovery +Description[sl]=KIO slave za odkrivanje storitev za Jabber +Description[sr]=KIO слуга за Jabber Service Discovery +Description[sr@Latn]=KIO sluga za Jabber Service Discovery +Description[sv]=En I/O-slav för Jabber tjänstupptäckt +Description[tr]=Jabber Servis Bulucu için KIOSlave +Description[uk]=Підлеглий В/В для виявлення служби Jabber +Description[zh_CN]=Jabber 服务发现的 KIO slave +Description[zh_HK]=用於發現 Jabber 服務的 KIO slave +Description[zh_TW]=Jabber 服務的 tdeioslave diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 2da7740e..34a2eb35 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index a9a00689..77356c55 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include "jabberprotocol.h" diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 71ad871f..a07c8f1d 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 03f8e008..dc66a0cf 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "kopeteaway.h" #include #include diff --git a/kopete/protocols/msn/config/CMakeLists.txt b/kopete/protocols/msn/config/CMakeLists.txt index 7e0d1337..d9fd401b 100644 --- a/kopete/protocols/msn/config/CMakeLists.txt +++ b/kopete/protocols/msn/config/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( install( FILES kopete_msn_config.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) + DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kcm_kopete_msn (module) ################### diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am index b5e2026a..f01cb0f1 100644 --- a/kopete/protocols/msn/config/Makefile.am +++ b/kopete/protocols/msn/config/Makefile.am @@ -8,5 +8,5 @@ kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_msn_config.desktop -servicedir = $(kde_servicesdir)/kconfiguredialog +servicedir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 58072441..39033752 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index df621d65..487f4aaa 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 84333bcf..c487f1df 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -26,17 +26,17 @@ #undef KDE_NO_COMPAT #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include -#include +#include #include "kopetecontactlist.h" #include "kopetechatsessionmanager.h" diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index cfe74905..3c480092 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "kopetetransfermanager.h" diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 1093370a..5f20d9ca 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -40,9 +40,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "kopeteuiglobal.h" diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 9ef32e04..cab1407d 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp index 58f4f66f..f8431f9f 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.cpp +++ b/kopete/protocols/msn/msnsecureloginhandler.cpp @@ -20,7 +20,7 @@ #include // KDE includes -#include +#include #include #include diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 2496006b..32b3d17a 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 7239e54f..9dc475ab 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 57764d14..57022e6d 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -31,15 +31,15 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include -#include +#include #include #include "kopeteuiglobal.h" diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index fde51060..b7f991cd 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "dispatcher.h" diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index ee9c0c4a..ba8d94b1 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 2e0100ab..e3c1f62b 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "kopetepassword.h" #include "kopetepasswordwidget.h" diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index f2a9bce9..9ca3baae 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index 04a312a4..edcf03ce 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 719e9122..76c46be2 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index bcaf454e..e7cb0a7a 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 45ade4c1..e8a83d69 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 6b303104..c459bdd0 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "kopeteaccount.h" #include "kopeteuiglobal.h" diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 0c7c6cad..93e7e033 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index e2095d25..40a60baa 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 10e09ae8..f3b8c35b 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -16,7 +16,7 @@ #undef KDE_NO_COMPAT -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index f47a0b46..d5980050 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -15,7 +15,7 @@ */ #undef KDE_NO_COMPAT -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index c2a1fb1e..f1872a21 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp index cd32d959..f232edc3 100644 --- a/kopete/protocols/sms/smsprotocol.cpp +++ b/kopete/protocols/sms/smsprotocol.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "kopeteaccountmanager.h" diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index 1213b3cf..39a098eb 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -27,7 +27,7 @@ // KDE Includes #include -#include +#include const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup"); diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index d7439628..994735cc 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include // Kopete Includes diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 0e0b6f43..414a1af6 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index b3c3f297..7e853fec 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include extern "C" diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index cd77498e..668e29c3 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -25,9 +25,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include using namespace KNetwork; diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index 4528612b..532e21bf 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent) { diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index e435f568..9cfe6763 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace KNetwork; diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index a5f8f821..95193241 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -22,9 +22,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 4eb82cc4..98df4ef0 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -22,9 +22,9 @@ #include "client.h" #include #include -#include -#include -#include +#include +#include +#include #include YABTask::YABTask(Task* parent) : Task(parent) diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index b9a270f8..96f96389 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -21,9 +21,9 @@ // KDE Includes #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 3f8650f5..96cc20c5 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -22,9 +22,9 @@ #include "client.h" #include #include -#include -#include -#include +#include +#include +#include #include YahooChatTask::YahooChatTask(Task* parent) : Task(parent) diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 53f7c2b4..7e36d04e 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -33,7 +33,7 @@ // KDE #include -#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 5402919c..3bb8e717 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 8d34689b..8e6132b6 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 3bd55b85..f827bba3 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -52,13 +52,13 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include -#include +#include YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact ) : Kopete::Contact( account, userId, metaContact ) diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index e047e849..8913eba3 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -32,9 +32,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index 14912167..62dde427 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include // Kopete Includes -- cgit v1.2.1