[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/wizards
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2008-07-31 21:56:14
Message-ID: 1217541374.252678.14201.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 840342 by wstephens:

Use more likely server defaults, and fix the email address suggestion code

 M  +1 -1      groupwise.kcfg  
 M  +6 -4      groupwisewizard.cpp  
 M  +0 -3      overviewpage.cpp  


--- trunk/KDE/kdepim/wizards/groupwise.kcfg #840341:840342
@@ -11,7 +11,7 @@
     </entry>
     <entry key="Port" type="UInt" >
       <label>Port</label>
-      <default>8201</default>
+      <default>7191</default>
     </entry>
     <entry key="User" type="String" >
       <label>User name</label>
--- trunk/KDE/kdepim/wizards/groupwisewizard.cpp #840341:840342
@@ -100,6 +100,7 @@
           r->prefs()->setUrl( serverUrl() );
           r->prefs()->setUser( GroupwiseConfig::self()->user() );
           r->prefs()->setPassword( GroupwiseConfig::self()->password() );
+          // TODO: don't change existing policy
           r->setSavePolicy( KCal::ResourceCached::SaveDelayed );
           r->setReloadPolicy( KCal::ResourceCached::ReloadInterval );
           r->setReloadInterval( 20 );
@@ -252,8 +253,9 @@
         if ( !email.isEmpty() ) ca->setEmail( email );
         ca->enableSavePassword( true );
         ca->enableSieve( false );
-        ca->setEncryption( CreateDisconnectedImapAccount::TLS );
-        ca->setAuthenticationSend( CreateDisconnectedImapAccount::LOGIN );
+        ca->setEncryption( CreateDisconnectedImapAccount::SSL );
+        ca->setAuthentication( CreateDisconnectedImapAccount::PLAIN );
+        ca->setAuthenticationSend( CreateDisconnectedImapAccount::PLAIN );
         ca->setSmtpPort( 25 );
 
         ca->setExistingAccountId( GroupwiseConfig::kMailAccountId() );
@@ -403,11 +405,11 @@
 {
   if ( page->widget() == mEmailPage ) {
     if ( mEmailEdit->text().isEmpty() ) {
-      QString host = GroupwiseConfig::host();
+      QString host = mServerEdit->text();
       int pos = host.lastIndexOf( "." );
       if ( pos > 0 ) pos = host.lastIndexOf( ".", pos - 1 );
       if ( pos > 0 ) host = host.mid( pos + 1 );
-      QString email = GroupwiseConfig::user() + '@' + host;
+      QString email = mUserEdit->text() + '@' + host;
       mEmailEdit->setText( email );
     }
   }
--- trunk/KDE/kdepim/wizards/overviewpage.cpp #840341:840342
@@ -119,9 +119,6 @@
 
 void OverViewPage::showWizardGroupwise()
 {
-#ifdef __GNUC__
-#warning Re-enable me as soon as we have the new GroupWise resource!
-#endif
   GroupwiseWizard wizard;
   wizard.exec();
 }
[prev in list] [next in list] [prev in thread] [next in thread]