From 708d185e3dc4c8df6a371d8c7c6d0b661519998b Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Sun, 25 Sep 2005 15:08:50 +0000
Subject: [PATCH] forward port: Remove the 'Expire settings..." menu entry
 since it did not really do that but showed the 'expire folder now?' dialog
 (it actually was disabled most of the time, which probably explans why nobody
 noticed).

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

diff --git a/kmail_part.rc b/kmail_part.rc
index 64e155750..267771f48 100644
--- a/kmail_part.rc
+++ b/kmail_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="3" name="kmail_part" >
+<kpartgui version="4" name="kmail_part" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -81,7 +81,6 @@
    <Separator/>
    <Action name="mark_all_as_read" />
    <Separator/>
-   <Action name="expire" />
    <Action name="remove_duplicate_messages" />
    <Separator/>
    <Action name="refresh_folder" />
diff --git a/kmmainwin.rc b/kmmainwin.rc
index 4d95cc1e0..9b2de0421 100644
--- a/kmmainwin.rc
+++ b/kmmainwin.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="85" name="kmmainwin" >
+<kpartgui version="86" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -84,7 +84,6 @@
    <Separator/>
    <Action name="mark_all_as_read" />
    <Separator/>
-   <Action name="expire" />
    <Action name="remove_duplicate_messages" />
    <Separator/>
    <Action name="refresh_folder" />