Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Wed Nov 28 23:31:00 CET 2007.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2007-11-14 17:37:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-11-21 18:58:12.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 21 18:58:12 CET 2007 - dmueller@suse.de
+
+- update to 3.96.1
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-3.96.0.tar.bz2
New:
----
kdepimlibs-3.96.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.p19420/_old 2007-11-28 23:30:18.000000000 +0100
+++ /var/tmp/diff_new_pack.p19420/_new 2007-11-28 23:30:18.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 3.96.0)
+# spec file for package kdepimlibs4 (Version 3.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 3.96.0
+Version: 3.96.1
Release: 1
-%define rversion 3.96.0
+%define rversion 3.96.1
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -110,7 +110,6 @@
--------
The KDE Team
-
%files -n libkdepimlibs4-devel
%defattr(-,root,root)
%doc COPYING COPYING.BSD COPYING.LIB
@@ -136,9 +135,9 @@
%endif
%_libdir/libkpimidentities.so
%_libdir/libqgpgme.so
-%dir %_libdir/Gpgmepp
-%_libdir/Gpgmepp/GpgmeppConfig.cmake
-%_libdir/Gpgmepp/GpgmeppLibraryDepends.cmake
+%dir %_libdir/gpgmepp
+%_libdir/gpgmepp/GpgmeppConfig.cmake
+%_libdir/gpgmepp/GpgmeppLibraryDepends.cmake
%files
%defattr(-,root,root)
@@ -151,7 +150,10 @@
%_kde_share_dir/servicetypes
%_kde_share_dir/config.kcfg/pimemoticons.kcfg
%_kde_share_dir/config.kcfg/mailtransport.kcfg
+
%changelog
+* Wed Nov 21 2007 - dmueller@suse.de
+- update to 3.96.1
* Wed Nov 14 2007 - dmueller@suse.de
- update to 3.96.0
* Tue Nov 06 2007 - dmueller@suse.de
++++++ kdepimlibs-3.96.0.tar.bz2 -> kdepimlibs-3.96.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/gpgme++/CMakeLists.txt new/kdepimlibs-3.96.1/gpgme++/CMakeLists.txt
--- old/kdepimlibs-3.96.0/gpgme++/CMakeLists.txt 2007-10-16 16:49:25.000000000 +0200
+++ new/kdepimlibs-3.96.1/gpgme++/CMakeLists.txt 2007-11-20 23:00:44.000000000 +0100
@@ -38,11 +38,7 @@
OUTPUT_NAME gpgme++
)
get_target_property( GPGMEPP_VANILLA_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_VANILLA_FOUND )
if ( GPGME_GLIB_FOUND )
@@ -54,11 +50,7 @@
OUTPUT_NAME gpgme++-glib DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_GLIB_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-glib
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-glib DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_GLIB_FOUND )
if ( GPGME_QT_FOUND )
@@ -70,11 +62,7 @@
OUTPUT_NAME gpgme++-qt DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_QT_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-qt
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-qt DESTINATION ${LIB_INSTALL_DIR})
endif ( GPGME_QT_FOUND )
if ( GPGME_PTHREAD_FOUND )
@@ -86,11 +74,7 @@
OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_PTHREAD_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-pthread
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-pthread DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_PTHREAD_FOUND )
if ( GPGME_PTH_FOUND )
@@ -102,11 +86,7 @@
OUTPUT_NAME gpgme++-pth DEFINE_SYMBOL MAKE_GPGME___LIB
)
get_target_property( GPGMEPP_PTH_LIBRARY gpgmepp LOCATION )
- install(TARGETS gpgmepp-pth
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
+ install(TARGETS gpgmepp-pth DESTINATION ${LIB_INSTALL_DIR} )
endif ( GPGME_PTH_FOUND )
@@ -138,6 +118,6 @@
${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake
DESTINATION
- ${LIB_INSTALL_DIR}/Gpgmepp )
+ ${LIB_INSTALL_DIR}/gpgmepp )
endif ( GPGME_FOUND )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/addresseehelper.cpp new/kdepimlibs-3.96.1/kabc/addresseehelper.cpp
--- old/kdepimlibs-3.96.0/kabc/addresseehelper.cpp 2007-10-08 09:43:53.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/addresseehelper.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -45,7 +45,7 @@
{
initSettings();
- QDBusConnection::sessionBus().connect( QString(), QString(),
+ QDBusConnection::sessionBus().connect( QString(), "/KABC",
"org.kde.kabc.AddressBookConfig", "changed",
this, SLOT(initSettings()));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/errorhandler.cpp new/kdepimlibs-3.96.1/kabc/errorhandler.cpp
--- old/kdepimlibs-3.96.0/kabc/errorhandler.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/errorhandler.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -46,7 +46,7 @@
void ConsoleErrorHandler::error( const QString &msg )
{
// no debug area is ok here
- kError() << msg;
+ kError(5700) << msg;
}
class GuiErrorHandler::Private
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/formatfactory.cpp new/kdepimlibs-3.96.1/kabc/formatfactory.cpp
--- old/kdepimlibs-3.96.0/kabc/formatfactory.cpp 2007-10-25 11:32:03.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/formatfactory.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -60,14 +60,14 @@
QString path = KLibLoader::findLibrary( libName );
if ( path.isEmpty() ) {
- kDebug( 5700 ) << "No format plugin library was found!";
+ kDebug(5700) << "No format plugin library was found!";
return 0;
}
library = KLibLoader::self()->library( path );
if ( !library ) {
- kDebug( 5700 ) << "Could not load library '" << libName << "'";
+ kDebug(5700) << "Could not load library '" << libName << "'";
return 0;
}
@@ -187,7 +187,7 @@
format->setNameLabel( fi.nameLabel );
format->setDescriptionLabel( fi.descriptionLabel );
} else {
- kDebug( 5700 ) << "'" << libName << "' is not a format plugin.";
+ kDebug(5700) << "'" << libName << "' is not a format plugin.";
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/formats/binary.desktop new/kdepimlibs-3.96.1/kabc/formats/binary.desktop
--- old/kdepimlibs-3.96.0/kabc/formats/binary.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/formats/binary.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Binär
Name[el]=Δυαδικό
Name[es]=Binario
+Name[et]=Binaar
Name[ga]=Dénártha
Name[hu]=Bináris
Name[ja]=バイナリ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/formats/binaryformat.cpp new/kdepimlibs-3.96.1/kabc/formats/binaryformat.cpp
--- old/kdepimlibs-3.96.0/kabc/formats/binaryformat.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/formats/binaryformat.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -57,7 +57,7 @@
return true;
}
-bool BinaryFormat::loadAll( AddressBook*, Resource *resource, QFile *file )
+bool BinaryFormat::loadAll( AddressBook *, Resource *resource, QFile *file )
{
kDebug(5700) << "BinaryFormat::loadAll()";
@@ -95,7 +95,7 @@
saveAddressee( addressee, stream );
}
-void BinaryFormat::saveAll( AddressBook*, Resource *resource, QFile *file )
+void BinaryFormat::saveAll( AddressBook *, Resource *resource, QFile *file )
{
kDebug(5700) << "BinaryFormat::saveAll()";
@@ -136,17 +136,17 @@
QFile *file = dynamic_cast( stream.device() );
if ( !file ) {
- kError() << i18n( "Not a file?" );
+ kError(5700) << i18n( "Not a file?" );
return false;
}
if ( magic != 0x2e93e ) {
- kError() << i18n( "File '%1' is not binary format.", file->fileName() );
+ kError(5700) << i18n( "File '%1' is not binary format.", file->fileName() );
return false;
}
if ( version != BINARY_FORMAT_VERSION ) {
- kError() << i18n( "File '%1' is the wrong version.", file->fileName() );
+ kError(5700) << i18n( "File '%1' is the wrong version.", file->fileName() );
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/kabc_manager.desktop new/kdepimlibs-3.96.1/kabc/kabc_manager.desktop
--- old/kdepimlibs-3.96.0/kabc/kabc_manager.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/kabc_manager.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -8,6 +8,7 @@
Name[de]=Kontakte
Name[el]=Επαφές
Name[es]=Contactos
+Name[et]=Kontaktid
Name[ga]=Teagmhálacha
Name[hu]=Partnerek
Name[ja]=コンタクト
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/ldifconverter.cpp new/kdepimlibs-3.96.1/kabc/ldifconverter.cpp
--- old/kdepimlibs-3.96.0/kabc/ldifconverter.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/ldifconverter.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -147,10 +147,11 @@
ldif_out( t, "organizationname", addr.organization() );
// Compatibility with older kabc versions.
- if ( !addr.department().isEmpty() )
+ if ( !addr.department().isEmpty() ) {
ldif_out( t, "department", addr.department() );
- else
- ldif_out( t, "department", addr.custom("KADDRESSBOOK", "X-Department") );
+ } else {
+ ldif_out( t, "department", addr.custom( "KADDRESSBOOK", "X-Department" ) );
+ }
ldif_out( t, "workurl", addr.url().prettyUrl() );
ldif_out( t, "homeurl", addr.url().prettyUrl() );
@@ -506,7 +507,7 @@
return true;
}
- kWarning() << QString( "LDIFConverter: Unknown field for '%1': '%2=%3'\n" ).
+ kWarning(5700) << QString( "LDIFConverter: Unknown field for '%1': '%2=%3'\n" ).
arg( a.formattedName() ).arg( fieldname ).arg( value );
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/locknull.cpp new/kdepimlibs-3.96.1/kabc/locknull.cpp
--- old/kdepimlibs-3.96.0/kabc/locknull.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/locknull.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -55,7 +55,7 @@
return false;
}
- kWarning() << "LockNull::lock() force success. Doesn't actually lock.";
+ kWarning(5700) << "LockNull::lock() force success. Doesn't actually lock.";
emit locked();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/dir/dir.desktop new/kdepimlibs-3.96.1/kabc/plugins/dir/dir.desktop
--- old/kdepimlibs-3.96.0/kabc/plugins/dir/dir.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/plugins/dir/dir.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Ordner
Name[el]=Κατάλογος
Name[es]=Directorio
+Name[et]=Kataloog
Name[ga]=Eolaire
Name[hu]=Könyvtár
Name[ja]=ディレクトリ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/file/file.desktop new/kdepimlibs-3.96.1/kabc/plugins/file/file.desktop
--- old/kdepimlibs-3.96.0/kabc/plugins/file/file.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/plugins/file/file.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Datei
Name[el]=Αρχείο
Name[es]=Archivo
+Name[et]=Fail
Name[ga]=Comhad
Name[hu]=Fájl
Name[ja]=ファイル
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkioconfig.cpp new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
--- old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkioconfig.cpp 2007-10-16 16:49:25.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkioconfig.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -296,7 +296,7 @@
i = 0;
j = 2;
}
- kDebug(7125) << "itkey:" << it.key() << "i:" << i;
+ kDebug(5700) << "itkey:" << it.key() << "i:" << i;
label = new QLabel( mNameDict[ it.key() ] + ':', page );
KLineEdit *lineedit = new KLineEdit( page );
mLineEditDict.insert( it.key(), lineedit );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkio.cpp new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkio.cpp
--- old/kdepimlibs-3.96.0/kabc/plugins/ldapkio/resourceldapkio.cpp 2007-10-08 09:43:52.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/plugins/ldapkio/resourceldapkio.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -152,7 +152,7 @@
eventLoop.exec( QEventLoop::ExcludeUserInputEvents );
}
-void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
+void ResourceLDAPKIO::entries( KIO::Job *, const KIO::UDSEntryList &list )
{
KIO::UDSEntryList::ConstIterator it = list.begin();
KIO::UDSEntryList::ConstIterator end = list.end();
@@ -161,7 +161,7 @@
if ( !urlStr.isEmpty() ) {
KUrl tmpurl( urlStr );
d->mResultDn = tmpurl.path();
- kDebug(7125) << "findUid():" << d->mResultDn;
+ kDebug(5700) << "findUid():" << d->mResultDn;
if ( d->mResultDn.startsWith( '/' ) ) {
d->mResultDn.remove( 0, 1 );
}
@@ -193,7 +193,7 @@
url.setFilter( '(' + mAttributes[ "uid" ] + '=' + uid + ')' + mFilter );
url.setExtension( "x-dir", "one" );
- kDebug(7125) << "ResourceLDAPKIO::findUid() uid:" << uid << "url" <<
+ kDebug(5700) << "ResourceLDAPKIO::findUid() uid:" << uid << "url" <<
url.prettyUrl();
KIO::ListJob *listJob = KIO::listDir( url, KIO::HideProgressInfo );
@@ -346,7 +346,7 @@
}
tmp += '\n';
- kDebug(7125) << "ldif:" << QString::fromUtf8( tmp );
+ kDebug(5700) << "ldif:" << QString::fromUtf8( tmp );
ldif = tmp;
return true;
}
@@ -485,7 +485,7 @@
d->mReadOnly = readOnly();
- kDebug(7125) << "resource_ldapkio url:" << d->mLDAPUrl.prettyUrl();
+ kDebug(5700) << "resource_ldapkio url:" << d->mLDAPUrl.prettyUrl();
}
void ResourceLDAPKIO::writeConfig( KConfigGroup &group )
@@ -525,7 +525,7 @@
Ticket *ResourceLDAPKIO::requestSaveTicket()
{
if ( !addressBook() ) {
- kDebug(7125) << "no addressbook";
+ kDebug(5700) << "no addressbook";
return 0;
}
@@ -592,7 +592,7 @@
bool ResourceLDAPKIO::load()
{
- kDebug(7125) << "ResourceLDAPKIO::load()";
+ kDebug(5700) << "ResourceLDAPKIO::load()";
KIO::Job *job;
clear();
@@ -622,10 +622,10 @@
d->enter_loop();
}
if ( d->mErrorMsg.isEmpty() ) {
- kDebug(7125) << "ResourceLDAPKIO load ok!";
+ kDebug(5700) << "ResourceLDAPKIO load ok!";
return true;
} else {
- kDebug(7125) << "ResourceLDAPKIO load finished with error:" << d->mErrorMsg;
+ kDebug(5700) << "ResourceLDAPKIO load finished with error:" << d->mErrorMsg;
addressBook()->error( d->mErrorMsg );
return false;
}
@@ -674,7 +674,7 @@
ret = d->mLdif.nextItem();
switch ( ret ) {
case KLDAP::Ldif::NewEntry:
- kDebug(7125) << "new entry:" << d->mLdif.dn().toString();
+ kDebug(5700) << "new entry:" << d->mLdif.dn().toString();
break;
case KLDAP::Ldif::Item:
name = d->mLdif.attr().toLower();
@@ -805,7 +805,7 @@
bool ResourceLDAPKIO::save( Ticket *ticket )
{
Q_UNUSED( ticket );
- kDebug(7125) << "ResourceLDAPKIO save";
+ kDebug(5700) << "ResourceLDAPKIO save";
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, KIO::Overwrite | KIO::HideProgressInfo );
@@ -815,10 +815,10 @@
this, SLOT( syncLoadSaveResult( KJob* ) ) );
d->enter_loop();
if ( d->mErrorMsg.isEmpty() ) {
- kDebug(7125) << "ResourceLDAPKIO save ok!";
+ kDebug(5700) << "ResourceLDAPKIO save ok!";
return true;
} else {
- kDebug(7125) << "ResourceLDAPKIO finished with error:" << d->mErrorMsg;
+ kDebug(5700) << "ResourceLDAPKIO finished with error:" << d->mErrorMsg;
addressBook()->error( d->mErrorMsg );
return false;
}
@@ -827,7 +827,7 @@
bool ResourceLDAPKIO::asyncSave( Ticket *ticket )
{
Q_UNUSED( ticket );
- kDebug(7125) << "ResourceLDAPKIO asyncSave";
+ kDebug(5700) << "ResourceLDAPKIO asyncSave";
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, KIO::Overwrite | KIO::HideProgressInfo );
connect( job, SIGNAL( dataReq( KIO::Job*, QByteArray& ) ),
@@ -868,15 +868,15 @@
}
if ( d->mSaveIt == end() ) {
- kDebug(7125) << "ResourceLDAPKIO endData";
+ kDebug(5700) << "ResourceLDAPKIO endData";
data.resize( 0 );
return;
}
- kDebug(7125) << "ResourceLDAPKIO saveData:" << (*d->mSaveIt).assembledName();
+ kDebug(5700) << "ResourceLDAPKIO saveData:" << (*d->mSaveIt).assembledName();
d->AddresseeToLDIF( data, *d->mSaveIt, d->findUid( (*d->mSaveIt).uid() ) );
-// kDebug(7125) << "ResourceLDAPKIO save LDIF:" << QString::fromUtf8(data);
+// kDebug(5700) << "ResourceLDAPKIO save LDIF:" << QString::fromUtf8(data);
// mark as unchanged
(*d->mSaveIt).setChanged( false );
@@ -887,14 +887,14 @@
{
QString dn = d->findUid( addr.uid() );
- kDebug(7125) << "ResourceLDAPKIO: removeAddressee:" << dn;
+ kDebug(5700) << "ResourceLDAPKIO: removeAddressee:" << dn;
if ( !d->mErrorMsg.isEmpty() ) {
addressBook()->error( d->mErrorMsg );
return;
}
if ( !dn.isEmpty() ) {
- kDebug(7125) << "ResourceLDAPKIO: found uid:" << dn;
+ kDebug(5700) << "ResourceLDAPKIO: found uid:" << dn;
KLDAP::LdapUrl url( d->mLDAPUrl );
url.setPath( '/' + dn );
url.setExtension( "x-dir", "base" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/plugins/net/net.desktop new/kdepimlibs-3.96.1/kabc/plugins/net/net.desktop
--- old/kdepimlibs-3.96.0/kabc/plugins/net/net.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/kabc/plugins/net/net.desktop 2007-11-20 23:00:45.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Netzwerk
Name[el]=Δίκτυο
Name[es]=Red
+Name[et]=Võrk
Name[ga]=Líonra
Name[hu]=Hálózat
Name[ja]=ネットワーク
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kabc/resourcecached.cpp new/kdepimlibs-3.96.1/kabc/resourcecached.cpp
--- old/kdepimlibs-3.96.0/kabc/resourcecached.cpp 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.1/kabc/resourcecached.cpp 2007-11-20 23:00:45.000000000 +0100
@@ -59,7 +59,7 @@
file.remove();
} else {
if ( !file.open( QIODevice::WriteOnly ) ) {
- kError() << "Can't open changes cache file '" << file.fileName() << "' for saving.";
+ kError(5700) << "Can't open changes cache file '" << file.fileName() << "' for saving.";
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kblog/Mainpage.dox new/kdepimlibs-3.96.1/kblog/Mainpage.dox
--- old/kdepimlibs-3.96.0/kblog/Mainpage.dox 2007-10-03 13:30:06.000000000 +0200
+++ new/kdepimlibs-3.96.1/kblog/Mainpage.dox 2007-11-22 18:15:38.000000000 +0100
@@ -32,3 +32,4 @@
*/
// DOXYGEN_PROJECTNAME=KBlog Client Library
+// DOXYGEN_EXCLUDE=livejournal.*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kcal/kcal_manager.desktop new/kdepimlibs-3.96.1/kcal/kcal_manager.desktop
--- old/kdepimlibs-3.96.0/kcal/kcal_manager.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kcal/kcal_manager.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -7,6 +7,7 @@
Name[de]=Kalender
Name[el]=Ημερολόγιο
Name[es]=Calendario
+Name[et]=Kalender
Name[fr]=Calendrier
Name[ga]=Féilire
Name[hu]=Naptár
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kcal/local.desktop new/kdepimlibs-3.96.1/kcal/local.desktop
--- old/kdepimlibs-3.96.0/kcal/local.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kcal/local.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -6,6 +6,7 @@
Name[de]=Kalender in lokaler Datei
Name[el]=Ημερολόγιο σε τοπικό αρχείο
Name[es]=Calendario en archivo local
+Name[et]=Kalender kohalikus failis
Name[fr]=Calendrier dans un fichier local
Name[ga]=Féilire i gComhad Logánta
Name[hu]=Helyi naptárfájl
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kcal/localdir.desktop new/kdepimlibs-3.96.1/kcal/localdir.desktop
--- old/kdepimlibs-3.96.0/kcal/localdir.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kcal/localdir.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -6,6 +6,7 @@
Name[de]=Kalender in lokalem Ordner
Name[el]=Ημερολόγιο σε τοπικό κατάλογο
Name[es]=Calendario en directorio local
+Name[et]=Kalender kohalikus kataloogis
Name[fr]=Calendrier dans un dossier local
Name[ga]=Féilire i gComhadlann Logánta
Name[hu]=Naptár helyi könyvtárban
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kioslave/sieve/sieve.protocol new/kdepimlibs-3.96.1/kioslave/sieve/sieve.protocol
--- old/kdepimlibs-3.96.0/kioslave/sieve/sieve.protocol 2007-10-31 21:36:03.000000000 +0100
+++ new/kdepimlibs-3.96.1/kioslave/sieve/sieve.protocol 2007-11-20 23:00:44.000000000 +0100
@@ -16,6 +16,7 @@
Description[de]=Ein Ein-/Ausgabemodul für das Mailfilter-Protokoll Sieve
Description[el]=Ένα ioslave για το πρωτόκολλο φιλτραρίσματος αλληλογραφίας Sieve
Description[es]=Un esclavo de E/S para el protocolo de filtrado de correo Sieve
+Description[et]=Sieve kirjade filtreerimise protokolli IO-moodul
Description[fr]=Un ioslave pour le protocole de filtrage de messagerie Sieve
Description[ga]=ioslave le haghaidh prótacail scagtha ríomhphoist Sieve
Description[hu]=KDE-protokoll a Sieve levélszűrő protokollhoz
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kresources/kresources.desktop new/kdepimlibs-3.96.1/kresources/kresources.desktop
--- old/kdepimlibs-3.96.0/kresources/kresources.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kresources/kresources.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -15,6 +15,7 @@
Name[de]=KDE-Ressourcen
Name[el]=Πόροι του KDE
Name[es]=Recursos KDE
+Name[et]=KDE ressursid
Name[ga]=Acmhainní KDE
Name[hu]=KDE-erőforrások
Name[ja]=KDE リソース
@@ -37,6 +38,7 @@
Comment[de]=KDE-Ressourcen einrichten
Comment[el]=Ρύθμιση πόρων του KDE
Comment[es]=Configurar recursos de KDE
+Comment[et]=KDE ressursside seadistamine
Comment[ga]=Cumraigh Acmhainní KDE
Comment[hu]=A KDE-erőforrások beállítása
Comment[ja]=KDE リソースの設定
@@ -56,9 +58,11 @@
Keywords[de]=Ressourcen,Konnector-Ressource,Kontakt-Ressource,Kalender-Ressource,Notizen-Ressource,Alarm-Ressource,Imap
Keywords[el]=πόροι,πόροι του konnector,πόρος επαφής,πόρος ημερολογίου,πόρος σημειώσεων,πόρος ειδοποίησης,imap
Keywords[es]=recursos,recursos de konnector,recursos de contacto,recursos de calendario,recursos de notas,recurso de alarma,imap
+Keywords[et]=ressursid,konnektori ressurss,kontakti ressurss,kalendri ressurss,märkmete ressurss,häire ressurss,imap
Keywords[ga]=acmhainní,acmhainn konnector,acmhainn teagmhála,acmhainn fhéilire,acmhainn nótaí,acmhainn aláraim,imap
Keywords[hu]=erőforrások,Konnector-erőforrás,névjegy,naptár,feljegyzés,emlékeztető,imap
Keywords[ja]=リソース,konnector resource, コネクターリソース,コンタクトリソース,カレンダーリソース, メモリソース,アラームリソースimap
+Keywords[nds]=Ressourcen,konnector-Ressource,Kontakt-Ressource,Kalenner-Ressource,Notiz-Ressource,Alarm-Ressource,IMAP
Keywords[nl]=hulpbronnen,konnector-hulpbron,contactpersoonhulpbron,agendahulpbron,notitiehulpbron,herinneringhulpbron,imap
Keywords[pt]=recursos,recurso do konector,recurso de contactos,recurso de calendário,recurso de notas,recurso de alarme,imap
Keywords[sv]=resurser,konnector-resurs,kontaktresurs,kalenderresurs,anteckningsresurs,alarmresurs,IMAP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kresources/kresources_manager.desktop new/kdepimlibs-3.96.1/kresources/kresources_manager.desktop
--- old/kdepimlibs-3.96.0/kresources/kresources_manager.desktop 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.1/kresources/kresources_manager.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -7,6 +7,7 @@
Comment[de]=KResource-Manager
Comment[el]=Διαχειριστής KResource
Comment[es]=Administrador KResource
+Comment[et]=KDE ressursside haldur
Comment[ga]=Bainisteoir KResource
Comment[hu]=Erőforráskezelő
Comment[ja]=K リソースマネージャ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/kresources/kresources_plugin.desktop new/kdepimlibs-3.96.1/kresources/kresources_plugin.desktop
--- old/kdepimlibs-3.96.0/kresources/kresources_plugin.desktop 2007-10-23 10:36:59.000000000 +0200
+++ new/kdepimlibs-3.96.1/kresources/kresources_plugin.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -7,6 +7,7 @@
Comment[de]=Modul für KResource-Framework
Comment[el]=Μικροεφαρμογή πλαισίου εργασίας του KResource
Comment[es]=Extensión de estructura KResource
+Comment[et]=KDE ressursside raamistiku plugin
Comment[ga]=Breiseán Creatlaí KResource
Comment[hu]=Modul a KResource keretrendszerhez
Comment[ja]=K リソース・フレームワーク・プラグイン
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/mailtransport/kcm_mailtransport.desktop new/kdepimlibs-3.96.1/mailtransport/kcm_mailtransport.desktop
--- old/kdepimlibs-3.96.0/mailtransport/kcm_mailtransport.desktop 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.96.1/mailtransport/kcm_mailtransport.desktop 2007-11-20 23:00:44.000000000 +0100
@@ -19,9 +19,11 @@
Name[de]=Versandart
Name[el]=Κύριος μεταφορέας
Name[es]=Transporte de correo
+Name[et]=Kirja saatmise viis
Name[ga]=Iompar Ríomhphoist
Name[hu]=Levéltovábbítás
Name[ja]=メール送信方法
+Name[nds]=Överdreegmetood
Name[nl]=E-mailtransport
Name[pt]=Transporte de Correio
Name[sl]=Prenos pošte
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.0/mailtransport/smtpsettings.ui new/kdepimlibs-3.96.1/mailtransport/smtpsettings.ui
--- old/kdepimlibs-3.96.0/mailtransport/smtpsettings.ui 2007-08-29 11:51:23.000000000 +0200
+++ new/kdepimlibs-3.96.1/mailtransport/smtpsettings.ui 2007-11-20 23:00:44.000000000 +0100
@@ -6,27 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
- <width>417</width>
- <height>488</height>
+ <width>425</width>
+ <height>472</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <item>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
<widget class="QLabel" name="titleLabel" >
<property name="font" >
<font>
@@ -39,10 +24,10 @@
</property>
</widget>
</item>
- <item>
+ <item row="1" column="0" >
<widget class="KSeparator" name="kseparator" />
</item>
- <item>
+ <item row="2" column="0" colspan="2" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
@@ -53,121 +38,137 @@
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
- <widget class="QLabel" name="nameLabel" >
- <property name="text" >
- <string>&Name:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_name</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2" >
- <widget class="KLineEdit" name="kcfg_name" />
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="nameLabel" >
+ <property name="text" >
+ <string>&Name:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_name</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="KLineEdit" name="kcfg_name" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="hostLabel" >
+ <property name="text" >
+ <string>&Host:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_host</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="KLineEdit" name="kcfg_host" />
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="portLabel" >
+ <property name="text" >
+ <string>&Port:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_port</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="KIntNumInput" name="kcfg_port" >
+ <property name="value" >
+ <number>25</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>231</width>
+ <height>23</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
</item>
<item row="1" column="0" >
- <widget class="QLabel" name="hostLabel" >
- <property name="text" >
- <string>&Host:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_host</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="KLineEdit" name="kcfg_host" />
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="KButtonGroup" name="kcfg_encryption" >
+ <property name="title" >
+ <string>Encryption</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QRadioButton" name="none" >
+ <property name="text" >
+ <string>&None</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="ssl" >
+ <property name="text" >
+ <string>&SSL</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="tls" >
+ <property name="text" >
+ <string>&TLS</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0" >
+ <widget class="KPushButton" name="checkCapabilities" >
+ <property name="text" >
+ <string>Check &What the Server Supports</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item row="2" column="0" >
- <widget class="QLabel" name="portLabel" >
- <property name="text" >
- <string>&Port:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_port</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KIntNumInput" name="kcfg_port" >
- <property name="value" >
- <number>25</number>
- </property>
- <property name="minimum" >
- <number>0</number>
- </property>
- <property name="maximum" >
- <number>65536</number>
- </property>
- </widget>
- </item>
- <item row="2" column="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="1" colspan="2" >
- <widget class="KButtonGroup" name="kcfg_encryption" >
- <property name="title" >
- <string>Encryption</string>
- </property>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QRadioButton" name="none" >
- <property name="text" >
- <string>&None</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="ssl" >
- <property name="text" >
- <string>&SSL</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="tls" >
- <property name="text" >
- <string>&TLS</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="4" column="0" colspan="2" >
- <widget class="QProgressBar" name="checkCapabilitiesProgress" >
- <property name="visible" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="KPushButton" name="checkCapabilities" >
- <property name="text" >
- <string>Check &What the Server Supports</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -175,12 +176,25 @@
<property name="sizeHint" >
<size>
<width>20</width>
- <height>111</height>
+ <height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
+ <widget class="QProgressBar" name="checkCapabilitiesProgress" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ </widget>
</widget>
<widget class="QWidget" name="advancedTab" >
<attribute name="title" >
@@ -188,161 +202,147 @@
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="noAuthPossible" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="visible" >
- <bool>false</bool>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
- </property>
- <property name="text" >
- <string>This server does not support authentication</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="kcfg_requiresAuthentication" >
<property name="text" >
<string>Server &requires authentication</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="usernameLabel" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>&Login:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_userName</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KLineEdit" name="kcfg_userName" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="passwordLabel" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>P&assword:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>password</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="KLineEdit" name="password" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="whatsThis" >
- <string>The password to send to the server for authorization.</string>
- </property>
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QCheckBox" name="kcfg_storePassword" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>&Store SMTP password</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1" >
- <widget class="KButtonGroup" name="kcfg_authenticationType" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="title" >
- <string>Authentication Method</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QRadioButton" name="login" >
- <property name="text" >
- <string>&LOGIN</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="plain" >
- <property name="text" >
- <string>&PLAIN</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QRadioButton" name="crammd5" >
- <property name="text" >
- <string>CRAM-MD&5</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QRadioButton" name="digestmd5" >
- <property name="text" >
- <string>&DIGEST-MD5</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QRadioButton" name="gssapi" >
- <property name="text" >
- <string>&GSSAPI</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QRadioButton" name="ntlm" >
- <property name="text" >
- <string>&NTLM</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <item row="1" column="0" colspan="2" >
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="usernameLabel" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>&Login:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_userName</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="KLineEdit" name="kcfg_userName" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="passwordLabel" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>P&assword:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>password</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="KLineEdit" name="password" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="whatsThis" >
+ <string>The password to send to the server for authorization.</string>
+ </property>
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QCheckBox" name="kcfg_storePassword" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>&Store SMTP password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="KButtonGroup" name="kcfg_authenticationType" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="title" >
+ <string>Authentication Method</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QRadioButton" name="login" >
+ <property name="text" >
+ <string>&LOGIN</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QRadioButton" name="plain" >
+ <property name="text" >
+ <string>&PLAIN</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QRadioButton" name="crammd5" >
+ <property name="text" >
+ <string>CRAM-MD&5</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QRadioButton" name="digestmd5" >
+ <property name="text" >
+ <string>&DIGEST-MD5</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QRadioButton" name="gssapi" >
+ <property name="text" >
+ <string>&GSSAPI</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QRadioButton" name="ntlm" >
+ <property name="text" >
+ <string>&NTLM</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="6" column="0" colspan="2" >
+ <item row="2" column="0" colspan="2" >
<widget class="KSeparator" name="kseparator_3" />
</item>
- <item row="7" column="0" colspan="2" >
+ <item row="3" column="0" colspan="2" >
<widget class="QCheckBox" name="kcfg_specifyHostname" >
<property name="text" >
<string>Sen&d custom hostname to server</string>
</property>
</widget>
</item>
- <item row="8" column="0" >
+ <item row="4" column="0" >
<widget class="QLabel" name="hostnameLabel" >
<property name="enabled" >
<bool>false</bool>
@@ -358,17 +358,17 @@
</property>
</widget>
</item>
- <item row="8" column="1" >
+ <item row="4" column="1" >
<widget class="KLineEdit" name="kcfg_localHostname" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
- <item row="9" column="0" colspan="2" >
+ <item row="5" column="0" colspan="2" >
<widget class="KSeparator" name="kseparator_2" />
</item>
- <item row="10" column="0" >
+ <item row="6" column="0" >
<widget class="QLabel" name="precommandLabel" >
<property name="text" >
<string>Precommand:</string>
@@ -378,23 +378,38 @@
</property>
</widget>
</item>
- <item row="10" column="1" >
+ <item row="6" column="1" >
<widget class="KLineEdit" name="kcfg_precommand" />
</item>
- <item row="11" column="1" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>214</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
+ <widget class="QLabel" name="noAuthPossible" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Raised</enum>
+ </property>
+ <property name="text" >
+ <string>This server does not support authentication</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
</widget>
</widget>
</item>
@@ -433,7 +448,6 @@
<tabstop>tabWidget</tabstop>
<tabstop>kcfg_name</tabstop>
<tabstop>kcfg_host</tabstop>
- <tabstop>kcfg_port</tabstop>
</tabstops>
<resources/>
<connections>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org