Re: Location of Filter settings

[Craig Routledge <webstuff craigroutledge com>]

It's a trivial enough change, so here's the patch anyways.

--- balsa/src/main-window.c	2005-06-30 12:24:53.000000000 -0400
+++ localBalsa/src/main-window.c	2005-08-28 11:21:13.000000000 -0400
@@ -487,13 +487,6 @@
     GNOMEUIINFO_MENU_FIND_ITEM(find_cb, NULL),
 #define MENU_EDIT_FIND_AGAIN_POS 4
     GNOMEUIINFO_MENU_FIND_AGAIN_ITEM(find_again_cb, NULL),
-/* #define MENU_EDIT_PREFERENCES_POS 7 */
-/*     GNOMEUIINFO_MENU_PREFERENCES_ITEM(open_preferences_manager, NULL), */
-    GNOMEUIINFO_SEPARATOR,
-    GNOMEUIINFO_ITEM_STOCK(N_("F_ilters..."), N_("Manage filters"),
-                           filter_dlg_cb, GTK_STOCK_PROPERTIES),
-    GNOMEUIINFO_ITEM_STOCK(N_("_Export Filters"), N_("Export filters as Sieve scripts"),
-			   filter_export_cb, GTK_STOCK_PROPERTIES),
     GNOMEUIINFO_END
 };
 
@@ -780,14 +773,19 @@
 /* default balsa menu */
 static GnomeUIInfo settings_menu[] = {
     GNOMEUIINFO_MENU_PREFERENCES_ITEM (open_preferences_manager, NULL),
-    GNOMEUIINFO_ITEM_STOCK(N_("_Toolbars..."),
-                           N_("Customize toolbars"),
-                           customize_dialog_cb,
-                           GTK_STOCK_EXECUTE),
+    GNOMEUIINFO_ITEM_STOCK(N_("_Filters..."), N_("Manage filters"),
+                           filter_dlg_cb, GTK_STOCK_PROPERTIES),
     GNOMEUIINFO_ITEM_STOCK(N_("_Identities..."), 
                            N_("Create and set current identities"), 
                            ident_manage_dialog_cb, 
                            BALSA_PIXMAP_IDENTITY),
+    GNOMEUIINFO_ITEM_STOCK(N_("_Toolbars..."),
+                           N_("Customize toolbars"),
+                           customize_dialog_cb,
+                           GTK_STOCK_EXECUTE),
+    GNOMEUIINFO_SEPARATOR,
+    GNOMEUIINFO_ITEM_STOCK(N_("_Export Filters"), N_("Export filters as Sieve scripts"),
+			   filter_export_cb, GTK_STOCK_PROPERTIES),
     GNOMEUIINFO_END
 };
 
--- balsa/doc/C/balsa.xml	2005-08-28 10:24:44.000000000 -0400
+++ localBalsa/doc/C/balsa.xml	2005-08-28 11:32:40.000000000 -0400
@@ -57,7 +57,7 @@
 <title>Balsa User's Guide</title>
 
 <copyright>
-  <year>1997-2004</year>
+  <year>1997-2005</year>
   <holder>Stuart Parmenter and others, see AUTHORS for a list of people
   </holder>
 </copyright>
@@ -92,10 +92,10 @@
 </legalnotice>
 
 <releaseinfo> 
-This is version 2.719 of the &Balsa; manual.
+This is version 2.720 of the &Balsa; manual.
 </releaseinfo>
 
-<revhistory><revision><date>28 May 2004</date></revision></revhistory>
+<revhistory><revision><date>28 August 2005</date></revision></revhistory>
 
 </articleinfo>
 
@@ -495,27 +495,6 @@
 	</para>
       </listitem>
 
-      <listitem>
-	<para>
-	  <menuchoice>
-	    <guimenu>Edit</guimenu>
-	    <guimenuitem>Filters</guimenuitem>
-	  </menuchoice> &mdash; 
-	  Open up the
-	  <link linkend="win-filters">filters window</link>.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  <menuchoice>
-	    <guimenu>Edit</guimenu>
-	    <guimenuitem>Export filters</guimenuitem>
-	  </menuchoice> &mdash; 
-	  Open up a window for exporting filters in the Sieve format.
-	</para>
-      </listitem>
-
     </itemizedlist>
 
   </listitem>
@@ -1084,11 +1063,10 @@
 	<para>
 	  <menuchoice>
 	    <guimenu>Settings</guimenu>
-	    <guimenuitem>Toolbars...</guimenuitem>
-	  </menuchoice> &mdash;
-	  
-	  Open the <link linkend="toolbar-prefs">Toolbars</link>
-     window to modify the content and arrangement of the toolbars in &Balsa;.
+	    <guimenuitem>Filters</guimenuitem>
+	  </menuchoice> &mdash; 
+	  Open up the
+	  <link linkend="win-filters">filters window</link>.
 	</para>
       </listitem>
 
@@ -1103,6 +1081,29 @@
      window to customize how you present yourself to the rest of the world.
 	</para>
       </listitem>
+
+      <listitem>
+	<para>
+	  <menuchoice>
+	    <guimenu>Settings</guimenu>
+	    <guimenuitem>Toolbars...</guimenuitem>
+	  </menuchoice> &mdash;
+	  
+	  Open the <link linkend="toolbar-prefs">Toolbars</link>
+     window to modify the content and arrangement of the toolbars in &Balsa;.
+	</para>
+      </listitem>
+
+      <listitem>
+	<para>
+	  <menuchoice>
+	    <guimenu>Settings</guimenu>
+	    <guimenuitem>Export filters</guimenuitem>
+	  </menuchoice> &mdash; 
+	  Open up a window for exporting filters in the Sieve format.
+	</para>
+      </listitem>
+
     </itemizedlist>
   </listitem>
 </varlistentry>