[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenox/konq-embed/dropin/kio
From: Dirk Mueller <mueller () kde ! org>
Date: 2006-03-30 9:02:04
Message-ID: 1143709324.240889.13168.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 524301 by mueller:
fix up KSSL info dialog
M +1 -1 uiserver.cpp
M +1 -1 uiserver.h
M +7 -4 uiserver_skel.cpp
--- trunk/kdenox/konq-embed/dropin/kio/uiserver.cpp #524300:524301
@@ -25,7 +25,7 @@
// DCOP function
-void UIServer::showSSLInfoDialog(const QString &url, const KIO::MetaData &meta)
+void UIServer::showSSLInfoDialog(const QString &url, const KIO::MetaData &meta, int)
{
KSSLInfoDlg *kid = new KSSLInfoDlg( meta["ssl_in_use"].upper()=="TRUE", 0L \
/*parent?*/, 0L, true );
KSSLCertificate *x = \
KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit());
--- trunk/kdenox/konq-embed/dropin/kio/uiserver.h #524300:524301
@@ -32,7 +32,7 @@
virtual ~UIServer() {}
k_dcop:
- void showSSLInfoDialog(const QString &url, const KIO::MetaData &data);
+ void showSSLInfoDialog(const QString &url, const KIO::MetaData &data, int \
mainwindow); };
#endif // __kio_uiserver_h__
--- trunk/kdenox/konq-embed/dropin/kio/uiserver_skel.cpp #524300:524301
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** DCOP Skeleton generated by dcopidl2cpp from uiserver.idl
+** DCOP Skeleton generated by dcopidl2cpp from uiserver.kidl
**
** WARNING! All changes made in this file will be lost!
**
@@ -12,7 +12,7 @@
static const char* const UIServer_ftable[2][3] = {
- { "void", "showSSLInfoDialog(QString,KIO::MetaData)", "showSSLInfoDialog(QString \
url,KIO::MetaData data)" }, + { "void", \
"showSSLInfoDialog(QString,KIO::MetaData,int)", "showSSLInfoDialog(QString \
url,KIO::MetaData data,int mainwindow)" }, { 0, 0, 0 }
};
static const int UIServer_ftable_hiddens[1] = {
@@ -21,16 +21,19 @@
bool UIServer::process(const QCString &fun, const QByteArray &data, QCString& \
replyType, QByteArray &replyData) {
- if ( fun == UIServer_ftable[0][1] ) { // void \
showSSLInfoDialog(QString,KIO::MetaData) + if ( fun == UIServer_ftable[0][1] ) { \
// void showSSLInfoDialog(QString,KIO::MetaData,int) QString arg0;
KIO::MetaData arg1;
+ int arg2;
QDataStream arg( data, IO_ReadOnly );
if (arg.atEnd()) return false;
arg >> arg0;
if (arg.atEnd()) return false;
arg >> arg1;
+ if (arg.atEnd()) return false;
+ arg >> arg2;
replyType = UIServer_ftable[0][0];
- showSSLInfoDialog(arg0, arg1 );
+ showSSLInfoDialog(arg0, arg1, arg2 );
} else {
return DCOPObject::process( fun, data, replyType, replyData );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic