TDE
/
tdevelop
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop
0
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Fix kded service and symbol export in support of commit 722ce1ef."

Browse Source 
This reverts commit 7fc46170cb.
pull/1/head
Michele Calgaro 11 years ago
parent fc09bfc4fd
commit 41f7ca9b5d
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
vcs/subversion/subversion_core.cpp
Unescape View File

@ -61,7 +61,7 @@ subversionCore::subversionCore(subversionPart *part)
m_widget = new subversionWidget(part, 0 , "subversionprocesswidget"); m_widget = new subversionWidget(part, 0 , "subversionprocesswidget");
// m_logViewWidget = new SvnLogViewWidget( part, 0 ); // m_logViewWidget = new SvnLogViewWidget( part, 0 );
// m_part->mainWindow()->embedOutputView( m_logViewWidget, i18n( "Subversion Log" ), i18n( "Subversion Log" ) ); // 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; // kdWarning() << "Failed to connect to kded dcop signal ! Notifications won't work..." << endl;
m_fileInfoProvider = new SVNFileInfoProvider( part ); m_fileInfoProvider = new SVNFileInfoProvider( part );

34
vcs/subversion/svn_tdeio.cpp
Unescape View File

@ -983,8 +983,8 @@ void tdeio_svnProtocol::popupMessage( const TQString& message ) {
// TQDataStream stream(params, IO_WriteOnly); // TQDataStream stream(params, IO_WriteOnly);
// stream << message; // stream << message;
// //
// if ( !dcopClient()->send( "kded","tdesvnd","popupMessage(TQString)", params ) ) // if ( !dcopClient()->send( "kded","ksvnd","popupMessage(TQString)", params ) )
// kdWarning() << "Communication with KDED:TDevSvnd failed" << endl; // 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 ) 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; KURL tpURL = url;
tpURL.cleanPath( true ); tpURL.cleanPath( true );
TQString svnUrl; TQString svnUrl;
if ( kproto == "tdevsvn+http" ) { if ( kproto == "kdevsvn+http" ) {
kdDebug(9036) << "http:/ " << url.url() << endl; kdDebug(9036) << "http:/ " << url.url() << endl;
tpURL.setProtocol("http"); tpURL.setProtocol("http");
svnUrl = tpURL.url(-1); svnUrl = tpURL.url(-1);
return svnUrl; return svnUrl;
} }
else if ( kproto == "tdevsvn+https" ) { else if ( kproto == "kdevsvn+https" ) {
kdDebug(9036) << "https:/ " << url.url() << endl; kdDebug(9036) << "https:/ " << url.url() << endl;
tpURL.setProtocol("https"); tpURL.setProtocol("https");
svnUrl = tpURL.url(-1); svnUrl = tpURL.url(-1);
return svnUrl; return svnUrl;
} }
else if ( kproto == "tdevsvn+ssh" ) { else if ( kproto == "kdevsvn+ssh" ) {
kdDebug(9036) << "svn+ssh:/ " << url.url() << endl; kdDebug(9036) << "svn+ssh:/ " << url.url() << endl;
tpURL.setProtocol("svn+ssh"); tpURL.setProtocol("svn+ssh");
svnUrl = tpURL.url(-1); svnUrl = tpURL.url(-1);
return svnUrl; return svnUrl;
} }
else if ( kproto == "tdevsvn+svn" ) { else if ( kproto == "kdevsvn+svn" ) {
kdDebug(9036) << "svn:/ " << url.url() << endl; kdDebug(9036) << "svn:/ " << url.url() << endl;
tpURL.setProtocol("svn"); tpURL.setProtocol("svn");
svnUrl = tpURL.url(-1); svnUrl = tpURL.url(-1);
return svnUrl; return svnUrl;
} }
else if ( kproto == "tdevsvn+file" ) { else if ( kproto == "kdevsvn+file" ) {
kdDebug(9036) << "file:/ " << url.url() << endl; kdDebug(9036) << "file:/ " << url.url() << endl;
tpURL.setProtocol("file"); tpURL.setProtocol("file");
svnUrl = tpURL.url(-1); 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->valid_from) << TQString::fromLocal8Bit(ci->valid_until);
arg << TQString::fromLocal8Bit(ci->issuer_dname) << TQString::fromLocal8Bit(ci->ascii_cert) ; arg << TQString::fromLocal8Bit(ci->issuer_dname) << TQString::fromLocal8Bit(ci->ascii_cert) ;
// call dcop // call dcop
int ret = p->dcopClient()->call( "kded", "tdevsvnd", int ret = p->dcopClient()->call( "kded", "kdevsvnd",
"sslServerTrustPrompt(TQString, TQString, TQString, TQString, TQString, TQString, TQString)", "sslServerTrustPrompt(TQString, TQString, TQString, TQString, TQString, TQString, TQString)",
params, replyType, replyData ); params, replyType, replyData );
if (!ret){ if (!ret){
@ -1746,7 +1746,7 @@ svn_error_t *tdeio_svnProtocol::clientCertSSLPrompt(
// TQByteArray params; // TQByteArray params;
// TQCString replyType; // TQCString replyType;
// call dcop // 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 "<<endl; // kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl;
// return SVN_NO_ERROR; // return SVN_NO_ERROR;
// } // }
@ -1779,7 +1779,7 @@ svn_error_t *tdeio_svnProtocol::clientCertPasswdPrompt(
// TQDataStream arg( params, IO_WriteOnly ); // TQDataStream arg( params, IO_WriteOnly );
// arg << i18n( "Enter password for subversion repository access" ) + "\n" + TQString(realm); // arg << i18n( "Enter password for subversion repository access" ) + "\n" + TQString(realm);
// // call dcop // // call dcop
// if (!p->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"<<endl; // kdWarning()<<" Communication with dcop failed - fail to show passwd dlg"<<endl;
// return SVN_NO_ERROR; // return SVN_NO_ERROR;
// } // }
@ -1860,17 +1860,17 @@ svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const cha
stream << slist.join("\n"); stream << slist.join("\n");
kdDebug(9036) << " __TIME__ " << __TIME__ << endl; kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
if ( !p->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; kdWarning() << "Communication with KDED:TDevSvnd failed" << endl;
svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, 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; return err;
} }
if ( replyType != TQSTRING_OBJECT_NAME_STRING ) { if ( replyType != TQSTRING_OBJECT_NAME_STRING ) {
kdWarning() << "Unexpected reply type" << endl; kdWarning() << "Unexpected reply type" << endl;
svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, 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; return err;
} }
@ -2136,19 +2136,19 @@ void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) {
extern "C" extern "C"
{ {
KDE_EXPORT int kdemain(int argc, char **argv) { 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) { 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); exit(-1);
} }
tdeio_svnProtocol slave(argv[2], argv[3]); tdeio_svnProtocol slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
kdDebug(9036) << "*** tdeio_tdevsvn Done" << endl; kdDebug(9036) << "*** tdeio_kdevsvn Done" << endl;
return 0; return 0;
} }
} }

2
vcs/subversion/tdevsvnd.cpp
Unescape View File

@ -36,7 +36,7 @@
#include "commitdlg.h" #include "commitdlg.h"
extern "C" { extern "C" {
KDE_EXPORT KDEDModule *create_tdevsvnd(const TQCString &name) { KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) {
return new TDevSvnd(name); return new TDevSvnd(name);
} }
} }

4
vcs/subversion/tdevsvnd.desktop
Unescape View File

@ -26,7 +26,7 @@ Name[zh_TW]=TDevelop Subversion 模組
Comment=Provides subversion client services with TDevelop Comment=Provides subversion client services with TDevelop
ServiceTypes=KDEDModule ServiceTypes=KDEDModule
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=tdevsvnd X-TDE-Library=kdevsvnd
X-TDE-FactoryName=tdevsvnd X-TDE-FactoryName=kdevsvnd
X-TDE-Kded-autoload=true X-TDE-Kded-autoload=true
X-TDE-Kded-load-on-demand=true X-TDE-Kded-load-on-demand=true

Write Preview
Loading…
Cancel
Save