From b8dfbed5bdda600e01f4b79d324d49a01a80cae2 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Thu, 5 Nov 2009 10:04:34 +0000
Subject: [PATCH] SVN_MERGE

Merged revisions 1043961,1044028,1044032,1044034,1044039,1044435 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1043961 | tmcguire | 2009-11-02 19:49:52 +0100 (Mon, 02 Nov 2009) | 5 lines

  Possibly fix a crash when exiting KMail, because the scheduler was never told to
  disconnect the slave.

  Bug figured out by honda@math.sci.hokudai.ac.jp, thanks very much!
........
  r1044028 | mkoller | 2009-11-02 22:26:18 +0100 (Mon, 02 Nov 2009) | 4 lines

  BUG: 212304

  really keep the backgroundcolor setting of a tag
........
  r1044032 | mkoller | 2009-11-02 22:33:20 +0100 (Mon, 02 Nov 2009) | 2 lines

  revert last change as backgroundcolor of a tag is only a trunk feature
........
  r1044034 | mkoller | 2009-11-02 22:38:54 +0100 (Mon, 02 Nov 2009) | 2 lines

  revert the revert done in the wrong branch :-(
........
  r1044039 | mkoller | 2009-11-02 22:56:19 +0100 (Mon, 02 Nov 2009) | 4 lines

  BUG: 212087

  mail source shall always be shown left-to-right
........
  r1044435 | mlaurent | 2009-11-03 20:02:51 +0100 (Tue, 03 Nov 2009) | 2 lines

  Don't add title when title is empty
........

svn path=/branches/work/akonadi-ports/kdepim/; revision=1045033
---
 configuredialog.cpp | 30 ++++++++++++++++++------------
 messageactions.cpp  |  3 ++-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/configuredialog.cpp b/configuredialog.cpp
index 99748209d..e342a44ad 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -2173,20 +2173,22 @@ void AppearancePage::MessageTagTab::slotRecordTagSettings( int aIndex )
 
   KMMessageTagDescription *tmp_desc = mMsgTagList->at( aIndex );
 
-  //First row
   tmp_desc->setName( mTagListBox->item( aIndex )->text() );
-  //Second row
+
   tmp_desc->setTextColor( mTextColorCheck->isChecked() ?
                           mTextColorCombo->color() : QColor() );
-  //Third row
+
+  tmp_desc->setBackgroundColor( mBackgroundColorCheck->isChecked() ?
+                                mBackgroundColorCombo->color() : QColor() );
+
   tmp_desc->setTextFont( mTextFontCheck->isChecked() ?
                           mFontRequester->font() : QFont() );
-  //Fourth row
+
   tmp_desc->setIconName( mIconButton->icon() );
-  //Fifth row
+
   mKeySequenceWidget->applyStealShortcut();
   tmp_desc->setShortcut( KShortcut(mKeySequenceWidget->keySequence()) );
-  //Sixth row
+
   tmp_desc->setInToolbar( mInToolbarCheck->isChecked() );
 }
 
@@ -2202,6 +2204,7 @@ void AppearancePage::MessageTagTab::slotUpdateTagSettingWidgets( int aIndex )
 
     mTagNameLineEdit->setEnabled( false );
     mTextColorCheck->setEnabled( false );
+    mBackgroundColorCheck->setEnabled( false );
     mTextFontCheck->setEnabled( false );
     mInToolbarCheck->setEnabled( false );
     mTextColorCombo->setEnabled( false );
@@ -2220,11 +2223,9 @@ void AppearancePage::MessageTagTab::slotUpdateTagSettingWidgets( int aIndex )
 
   KMMessageTagDescription *tmp_desc = mMsgTagList->at( mTagListBox->currentRow() );
 
-  //1st row
   mTagNameLineEdit->setEnabled( true );
   mTagNameLineEdit->setText( tmp_desc->name() );
 
-  //2nd row
   QColor tmp_color = tmp_desc->textColor();
   mTextColorCheck->setEnabled( true );
   if ( tmp_color.isValid() ) {
@@ -2234,22 +2235,27 @@ void AppearancePage::MessageTagTab::slotUpdateTagSettingWidgets( int aIndex )
     mTextColorCheck->setChecked( false );
   }
 
-  //3rd row
+  tmp_color = tmp_desc->backgroundColor();
+  mBackgroundColorCheck->setEnabled( true );
+  if ( tmp_color.isValid() ) {
+    mBackgroundColorCombo->setColor( tmp_color );
+    mBackgroundColorCheck->setChecked( true );
+  } else {
+    mBackgroundColorCheck->setChecked( false );
+  }
+
   QFont tmp_font = tmp_desc->textFont();
   mTextFontCheck->setEnabled( true );
   mTextFontCheck->setChecked( ( tmp_font != QFont() ) );
   mFontRequester->setFont( tmp_font );
 
-  //4th row
   mIconButton->setEnabled( true );
   mIconButton->setIcon( tmp_desc->toolbarIconName() );
 
-  //5th row
   mKeySequenceWidget->setEnabled( true );
   mKeySequenceWidget->setKeySequence( tmp_desc->shortcut().primary(),
                                       KKeySequenceWidget::NoValidate );
 
-  //6th row
   mInToolbarCheck->setEnabled( true );
   mInToolbarCheck->setChecked( tmp_desc->inToolbar() );
 
diff --git a/messageactions.cpp b/messageactions.cpp
index ecc194051..bf6aa3721 100644
--- a/messageactions.cpp
+++ b/messageactions.cpp
@@ -274,7 +274,8 @@ void MessageActions::updateActions()
         }
       }
       mMailingListActionMenu->menu()->clear();
-      mMailingListActionMenu->menu()->addTitle( listId );
+      if ( !listId.isEmpty() )
+        mMailingListActionMenu->menu()->addTitle( listId );
 
       if ( mailList.features() & MailingList::ArchivedAt )
         // IDEA: this may be something you want to copy - "Copy in submenu"?