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

List:       kde-commits
Subject:    KDE/kdepim/kontact/src
From:       Allen Winter <winter () kde ! org>
Date:       2009-10-03 16:13:10
Message-ID: 1254586390.010520.11038.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1030966 by winterz:

Read the Groupware:Enabled settings from kmailrc.  Use this to determine if \
Groupware is being used.  If so, put the Sync button on by default.

In the Enterprise version, we still put on the Sync button unless the user \
explicitly turns if off using kontactrc's Kontact Groupware \
Settings:GroupwareMailFoldersEnabled.

MERGE: e4
DO_NOT_BACKPORT: 


 M  +9 -5      mainwindow.cpp  


--- trunk/KDE/kdepim/kontact/src/mainwindow.cpp #1030965:1030966
@@ -434,13 +434,16 @@
   // If the user is using disconnected imap mail folders as groupware, we \
add  // plugins' Synchronize actions to the toolbar which trigger an imap \
sync.  // Otherwise it's redundant and misleading.
-  KConfig *_cfg = Prefs::self()->config();
-  KConfigGroup cfg( _cfg, "Kontact Groupware Settings" );
+  KConfig _config( "kmailrc" );
+  KConfigGroup config( &_config, "Groupware" );
 #if defined(KDEPIM_ENTERPRISE_BUILD)
-  mSyncActionsEnabled = cfg.readEntry( "GroupwareMailFoldersEnabled", true \
); +  bool defGW = config.readEntry( "Enabled", true );
 #else
-  mSyncActionsEnabled = cfg.readEntry( "GroupwareMailFoldersEnabled", \
false ); +  bool defGW = config.readEntry( "Enabled", false );
 #endif
+  KConfig *_cfg = Prefs::self()->config();
+  KConfigGroup cfg( _cfg, "Kontact Groupware Settings" );
+  mSyncActionsEnabled = cfg.readEntry( "GroupwareMailFoldersEnabled", \
defGW );  
   if ( mSyncActionsEnabled ) {
     mSyncActions = new KActionMenu(
@@ -501,7 +504,8 @@
 
     kDebug() << "Loading Plugin:" << it->name();
     QString error;
-    plugin =  it->service()->createInstance<KontactInterface::Plugin>( \
this, QVariantList(), &error ); +    plugin =
+      it->service()->createInstance<KontactInterface::Plugin>( this, \
QVariantList(), &error );  
     if ( !plugin ) {
       kDebug() << "Unable to create plugin for" << it->name() << error;


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