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

@@ -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>

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);

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>