From 41f7ca9b5d2cf09d3a1bfcb32f086408ce1f4c9e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:36:42 +0900 Subject: [PATCH] Revert "Fix kded service and symbol export in support of commit 722ce1ef." This reverts commit 7fc46170cb07fb71debd870887b6a85aa89f5e26. --- vcs/subversion/subversion_core.cpp | 2 +- vcs/subversion/svn_tdeio.cpp | 34 +++++++++++++++--------------- vcs/subversion/tdevsvnd.cpp | 2 +- vcs/subversion/tdevsvnd.desktop | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 0f67d87d..108bf298 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -61,7 +61,7 @@ subversionCore::subversionCore(subversionPart *part) m_widget = new subversionWidget(part, 0 , "subversionprocesswidget"); // m_logViewWidget = new SvnLogViewWidget( part, 0 ); // m_part->mainWindow()->embedOutputView( m_logViewWidget, i18n( "Subversion Log" ), i18n( "Subversion Log" ) ); -// if ( ! connectDCOPSignal("kded", "tdesvnd", "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", "notification(TQString,int,int,TQString,int,int,long int,TQString)", false ) ) +// if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", "notification(TQString,int,int,TQString,int,int,long int,TQString)", false ) ) // kdWarning() << "Failed to connect to kded dcop signal ! Notifications won't work..." << endl; m_fileInfoProvider = new SVNFileInfoProvider( part ); diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp index 4a728f17..0abac2b8 100644 --- a/vcs/subversion/svn_tdeio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -983,8 +983,8 @@ void tdeio_svnProtocol::popupMessage( const TQString& message ) { // TQDataStream stream(params, IO_WriteOnly); // stream << message; // -// if ( !dcopClient()->send( "kded","tdesvnd","popupMessage(TQString)", params ) ) -// kdWarning() << "Communication with KDED:TDevSvnd failed" << endl; +// if ( !dcopClient()->send( "kded","ksvnd","popupMessage(TQString)", params ) ) +// kdWarning() << "Communication with KDED:KSvnd failed" << endl; } void tdeio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ) @@ -1632,31 +1632,31 @@ TQString tdeio_svnProtocol::makeSvnURL ( const KURL& url ) const { KURL tpURL = url; tpURL.cleanPath( true ); TQString svnUrl; - if ( kproto == "tdevsvn+http" ) { + if ( kproto == "kdevsvn+http" ) { kdDebug(9036) << "http:/ " << url.url() << endl; tpURL.setProtocol("http"); svnUrl = tpURL.url(-1); return svnUrl; } - else if ( kproto == "tdevsvn+https" ) { + else if ( kproto == "kdevsvn+https" ) { kdDebug(9036) << "https:/ " << url.url() << endl; tpURL.setProtocol("https"); svnUrl = tpURL.url(-1); return svnUrl; } - else if ( kproto == "tdevsvn+ssh" ) { + else if ( kproto == "kdevsvn+ssh" ) { kdDebug(9036) << "svn+ssh:/ " << url.url() << endl; tpURL.setProtocol("svn+ssh"); svnUrl = tpURL.url(-1); return svnUrl; } - else if ( kproto == "tdevsvn+svn" ) { + else if ( kproto == "kdevsvn+svn" ) { kdDebug(9036) << "svn:/ " << url.url() << endl; tpURL.setProtocol("svn"); svnUrl = tpURL.url(-1); return svnUrl; } - else if ( kproto == "tdevsvn+file" ) { + else if ( kproto == "kdevsvn+file" ) { kdDebug(9036) << "file:/ " << url.url() << endl; tpURL.setProtocol("file"); svnUrl = tpURL.url(-1); @@ -1701,7 +1701,7 @@ svn_error_t *tdeio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t arg << TQString::fromLocal8Bit(ci->valid_from) << TQString::fromLocal8Bit(ci->valid_until); arg << TQString::fromLocal8Bit(ci->issuer_dname) << TQString::fromLocal8Bit(ci->ascii_cert) ; // call dcop - int ret = p->dcopClient()->call( "kded", "tdevsvnd", + int ret = p->dcopClient()->call( "kded", "kdevsvnd", "sslServerTrustPrompt(TQString, TQString, TQString, TQString, TQString, TQString, TQString)", params, replyType, replyData ); if (!ret){ @@ -1746,7 +1746,7 @@ svn_error_t *tdeio_svnProtocol::clientCertSSLPrompt( // TQByteArray params; // TQCString replyType; // call dcop -// if (!p->dcopClient()->call("kded","tdevsvnd", "sslCertFile()",params,replyType,reply)) { +// if (!p->dcopClient()->call("kded","kdevsvnd", "sslCertFile()",params,replyType,reply)) { // kdWarning()<<" Communication with dcop failed - fail to get certfile "<dcopClient()->call("kded","tdevsvnd", "sslPasswdDlg(TQString)",params,replyType,reply)) { +// if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(TQString)",params,replyType,reply)) { // kdWarning()<<" Communication with dcop failed - fail to show passwd dlg"<dcopClient()->call( "kded","tdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) { + if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) { kdWarning() << "Communication with KDED:TDevSvnd failed" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, - apr_pstrdup( pool, "Fail to call kded_tdevsvnd via DCOP. If this is your first problem, try to restart TDE" ) ); + apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) ); return err; } if ( replyType != TQSTRING_OBJECT_NAME_STRING ) { kdWarning() << "Unexpected reply type" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, - apr_pstrdup( pool, "Fail to call kded_tdevsvnd via DCOP." ) ); + apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP." ) ); return err; } @@ -2136,19 +2136,19 @@ void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { KDE_EXPORT int kdemain(int argc, char **argv) { - TDEInstance instance( "tdeio_tdevsvn" ); + TDEInstance instance( "tdeio_kdevsvn" ); - kdDebug(9036) << "*** Starting tdeio_tdevsvn " << endl; + kdDebug(9036) << "*** Starting tdeio_kdevsvn " << endl; if (argc != 4) { - kdDebug(9036) << "Usage: tdeio_tdevsvn protocol domain-socket1 domain-socket2" << endl; + kdDebug(9036) << "Usage: tdeio_kdevsvn protocol domain-socket1 domain-socket2" << endl; exit(-1); } tdeio_svnProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); - kdDebug(9036) << "*** tdeio_tdevsvn Done" << endl; + kdDebug(9036) << "*** tdeio_kdevsvn Done" << endl; return 0; } } diff --git a/vcs/subversion/tdevsvnd.cpp b/vcs/subversion/tdevsvnd.cpp index 427ad7e2..ea42667b 100644 --- a/vcs/subversion/tdevsvnd.cpp +++ b/vcs/subversion/tdevsvnd.cpp @@ -36,7 +36,7 @@ #include "commitdlg.h" extern "C" { - KDE_EXPORT KDEDModule *create_tdevsvnd(const TQCString &name) { + KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { return new TDevSvnd(name); } } diff --git a/vcs/subversion/tdevsvnd.desktop b/vcs/subversion/tdevsvnd.desktop index 7302bf5a..9ba3e877 100644 --- a/vcs/subversion/tdevsvnd.desktop +++ b/vcs/subversion/tdevsvnd.desktop @@ -26,7 +26,7 @@ Name[zh_TW]=TDevelop Subversion 模組 Comment=Provides subversion client services with TDevelop ServiceTypes=KDEDModule X-TDE-ModuleType=Library -X-TDE-Library=tdevsvnd -X-TDE-FactoryName=tdevsvnd +X-TDE-Library=kdevsvnd +X-TDE-FactoryName=kdevsvnd X-TDE-Kded-autoload=true X-TDE-Kded-load-on-demand=true