From 3b343ea336807a6cd28c6f87f45d4eaec187ef3c Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Sat, 3 Dec 2005 12:50:08 +0000
Subject: [PATCH] Backport "don't add separator when we don't add filter into
 apply filter menu"

svn path=/trunk/KDE/kdepim/; revision=485222
---
 kmail_part.rc    | 3 +--
 kmmainwidget.cpp | 1 +
 kmmainwin.rc     | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/kmail_part.rc b/kmail_part.rc
index 394843f00..0268658fb 100644
--- a/kmail_part.rc
+++ b/kmail_part.rc
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="4" name="kmail_part" >
+<kpartgui version="5" name="kmail_part" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -137,7 +137,6 @@
    <Menu name="apply_filter_actions" >
      <text>A&amp;pply Filter</text>
      <Action name="apply_filters" /> 
-     <Separator/>
      <ActionList name="menu_filter_actions" />
    </Menu>
   </Menu>
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index d49da9d89..2f18bc066 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -3326,6 +3326,7 @@ void KMMainWidget::initializeFilterActions()
       if(!addedSeparator) {
         mApplyFilterActionsMenu->popupMenu()->insertSeparator();
         addedSeparator = !addedSeparator;
+	mFilterMenuActions.append( new KActionSeparator());
       }
       filterAction->plug( mApplyFilterActionsMenu->popupMenu() );
       mFilterMenuActions.append(filterAction);
diff --git a/kmmainwin.rc b/kmmainwin.rc
index 2db2ae132..e6de50cd5 100644
--- a/kmmainwin.rc
+++ b/kmmainwin.rc
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="86" name="kmmainwin" >
+<kpartgui version="87" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -140,7 +140,6 @@
    <Menu name="apply_filter_actions" >
      <text>A&amp;pply Filter</text>
      <Action name="apply_filters" /> 
-     <Separator/>
      <ActionList name="menu_filter_actions" />
    </Menu>
   </Menu>