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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-05-13 12:42:29
Message-ID: 1242218549.801750.25489.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967425 by tmcguire:

Merged revisions 965053 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r965053 | winterz | 2009-05-07 22:59:50 +0200 (Thu, 07 May 2009) | 14 lines
  
  Merged revisions 960932 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r960932 | mlaurent | 2009-04-29 06:04:31 -0400 (Wed, 29 Apr 2009) | 7 lines
    
    Fix kolab issue 3268 (kmail reply prefixes changes require restart of app to take effect)
    Signal configCommitted is send before that we apply all config.
    so necessary to create an other signal send at the end.
    and necessary to write config before to send it and not before to apply all.
    
    Need to backport to e4/trunk/kde4.2 I think but need to make some test 
  ........
................


 M  +2 -0      configuredialog.cpp  
 M  +1 -0      configuredialog.h  
 M  +1 -1      kmkernel.cpp  


--- trunk/KDE/kdepim/kmail/configuredialog.cpp #967424:967425
@@ -290,10 +290,12 @@
 
 void ConfigureDialog::slotApply() {
   GlobalSettings::self()->writeConfig();
+  emit configChanged();
 }
 
 void ConfigureDialog::slotOk() {
   GlobalSettings::self()->writeConfig();
+  emit configChanged();
 }
 
 void ConfigureDialog::slotUser2() {
--- trunk/KDE/kdepim/kmail/configuredialog.h #967424:967425
@@ -50,6 +50,7 @@
       included in the file.
   */
   void installProfile( KConfig *profile );
+  void configChanged();
 protected:
   void hideEvent( QHideEvent *i );
 protected slots:
--- trunk/KDE/kdepim/kmail/kmkernel.cpp #967424:967425
@@ -1922,7 +1922,7 @@
   if( !mConfigureDialog ) {
     mConfigureDialog = new ConfigureDialog( 0, false );
     mConfigureDialog->setObjectName( "configure" );
-    connect( mConfigureDialog, SIGNAL( configCommitted() ),
+    connect( mConfigureDialog, SIGNAL( configChanged() ),
              this, SLOT( slotConfigChanged() ) );
   }
 
[prev in list] [next in list] [prev in thread] [next in thread]