[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-docbook
Subject: KDE/kdenetwork/kopete/plugins/cryptography
From: Charles Connell <charles () connells ! org>
Date: 2007-08-17 1:09:48
Message-ID: 1187312988.983309.27162.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 701014 by cconnell:
Cleanup
GUI:Less intrusive behavior of unsupported protocol warning
M +1 -2 CMakeLists.txt
M +2 -2 cryptographyguiclient.cpp
M +1 -0 cryptographyguiclient.h
M +3 -3 cryptographyplugin.cpp
M +3 -5 cryptographyplugin.h
M +1 -1 cryptographyprefsbase.ui
D cryptographyuserkey_ui.ui
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/CMakeLists.txt #701013:701014
@@ -14,8 +14,7 @@
cryptographyselectuserkey.cpp
cryptographyconfig.cpp )
-kde4_add_ui_files(kopete_cryptography_PART_SRCS
- cryptographyuserkey_ui.ui)
+kde4_add_ui_files(kopete_cryptography_PART_SRCS)
kde4_add_plugin(kopete_cryptography ${kopete_cryptography_PART_SRCS})
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographyguiclient.cpp \
#701013:701014 @@ -2,6 +2,7 @@
cryptographyguiclient.cpp
Copyright (c) 2004 by Olivier Goffart <ogoffart@kde.org>
+ Copyright (c) 2007 by Charles Connell <charles@connells.org>
Kopete (c) 2003-2004 by the Kopete developers <kopete-devel@kde.org>
@@ -115,8 +116,7 @@
QString protocol ( csn->protocol()->metaObject()->className());
if ( m_encAction->isChecked() )
if ( ! CryptographyPlugin::supportedProtocols().contains (protocol) )
- if (KMessageBox::questionYesNo ( 0L, i18n ("This protocol may not work with \
messages that are encrypted. Do you still want to encrypt messages?"), i18n \
("Cryptography Plugin"), KStandardGuiItem::yes(), KStandardGuiItem::no(), "Dont warn \
about unsupported protocols") == KMessageBox::No )
- m_encAction->setChecked (false);
+ KMessageBox::information ( 0, i18n ( "This protocol may not work with messages \
that are encrypted. This is because encrypted messages are very long, and the server \
or peer may reject them due to their length. To avoid being signed off or your \
account being warned or temporarily suspended, turn off encryption." ), i18n ( \
"Cryptography Unsupported Protocol" ), "Warn about unsupported " + QString \
(csn->protocol()->metaObject()->className()) );
}
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographyguiclient.h \
#701013:701014 @@ -2,6 +2,7 @@
cryptographyguiclient.h
Copyright (c) 2004 by Olivier Goffart <ogoffart@kde.org>
+ Copyright (c) 2007 by Charles Connell <charles@connells.org>
Kopete (c) 2003-2004 by the Kopete developers <kopete-devel@kde.org>
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographyplugin.cpp \
#701013:701014 @@ -1,7 +1,8 @@
/*
cryptographyplugin.cpp - description
- Copyright (c) 2002-2004 by Olivier Goffart <ogoffart@kde.org>
+ Copyright (c) 2002-2004 by Olivier Goffart <ogoffart@kde.org>
+ Copyright (c) 2007 by Charles Connell <charles@connells.org>
Kopete (c) 2002-2007 by the Kopete developers <kopete-devel@kde.org>
@@ -262,8 +263,7 @@
QString protocol ( KMM->protocol()->metaObject()->className() );
if ( mGui->m_encAction->isChecked() )
if ( ! supportedProtocols().contains ( protocol ) )
- if ( KMessageBox::questionYesNo ( 0L, i18n ( "This protocol may not work with \
messages that are encrypted. Do you still want to encrypt messages?" ), i18n ( \
"Cryptography Plugin" ), KStandardGuiItem::yes(), KStandardGuiItem::no(), "Dont warn \
about unsupported protocols" ) == KMessageBox::No )
- mGui->m_encAction->setChecked ( false );
+ KMessageBox::information ( 0, i18n ( "This protocol may not work with messages \
that are encrypted. This is because encrypted messages are very long, and the server \
or peer may reject them due to their length. To avoid being signed off or your \
account being warned or temporarily suspended, turn off encryption." ), i18n ( \
"Cryptography Unsupported Protocol" ), "Warn about unsupported " + QString \
(KMM->protocol()->metaObject()->className()) ); }
#include "cryptographyplugin.moc"
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographyplugin.h \
#701013:701014 @@ -1,7 +1,8 @@
/*
cryptographyplugin.h - description
- Copyright (c) 2002-2004 by Olivier Goffart <ogoffart@kde.org>
+ Copyright (c) 2002-2004 by Olivier Goffart <ogoffart@kde.org>
+ Copyright (c) 2007 by Charles Connell <charles@connells.org>
Kopete (c) 2002-2007 by the Kopete developers <kopete-devel@kde.org>
@@ -18,9 +19,6 @@
#ifndef CRYPTOGRAPHYPLUGIN_H
#define CRYPTOGRAPHYPLUGIN_H
-
-#include <QQueue>
-
#include "kopeteplugin.h"
#include "cryptographyconfig.h"
@@ -51,7 +49,7 @@
static QString cachedPass();
static void setCachedPass(const QString &pass);
- static QStringList supportedProtocols() { QStringList l; return l << "MSNProtocol" \
<< "MessengerProtocol" << "JabberProtocol"; } + static QStringList \
supportedProtocols() { QStringList l; return l << "MSNProtocol" << \
"MessengerProtocol" << "JabberProtocol" << "YahooProtocol"; }
CryptographyPlugin( QObject *parent, const QStringList &args );
~CryptographyPlugin();
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographyprefsbase.ui \
#701013:701014 @@ -1,5 +1,5 @@
<ui version="4.0" >
- <author>Olivier Goffart</author>
+ <author>Olivier Goffart, Charles Connell</author>
<class>CryptographyPrefsUI</class>
<widget class="QWidget" name="CryptographyPrefsUI" >
<property name="geometry" >
_______________________________________________
kde-docbook mailing list
kde-docbook@kde.org
https://mail.kde.org/mailman/listinfo/kde-docbook
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic