Get the File -> Folder -> Properties menu item work again for the

mailer.

svn path=/trunk/; revision=10793

7 files changed, 24 insertions, 39 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index d373b3bfa7..123cfd0795 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,18 @@
+2001-07-05  Ettore Perazzoli  <ettore@ximian.com>
+
+	* e-shell-view-menu.c: Removed handler for verb
+	"ChangeFolderProperties".
+	(command_folder_properties): Removed.
+
+	* e-shell-folder-commands.c (e_shell_command_folder_properties):
+	Removed.
+
+2001-07-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* main.c (development_warning): Use both `VERSION' and
+	`SUB_VERSION' here.
+	(main): Likewise.
+
 2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
 
 	* evolution-shell-component-utils.c (e_pixmaps_update): set
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index ba8f645c16..d4670b7c29 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -433,16 +433,3 @@ e_shell_command_add_to_shortcut_bar (EShell *shell,
 
 	e_shortcuts_add_shortcut (shortcuts, group_num, -1, uri, NULL, NULL);
 }
-
-
-void
-e_shell_command_folder_properties (EShell *shell,
-				   EShellView *shell_view)
-{
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-	g_return_if_fail (shell_view != NULL);
-	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
-
-	g_warning ("To be implemented");
-}
diff --git a/shell/e-shell-folder-commands.h b/shell/e-shell-folder-commands.h
index 95585f1d43..2a3f61d863 100644
--- a/shell/e-shell-folder-commands.h
+++ b/shell/e-shell-folder-commands.h
@@ -38,6 +38,4 @@ void  e_shell_command_rename_folder        	  (EShell *shell, EShellView *shell_
 
 void  e_shell_command_add_to_shortcut_bar         (EShell *shell, EShellView *shell_view);
 
-void  e_shell_command_folder_properties           (EShell *shell, EShellView *shell_view);
-
 #endif
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 7e5bef44b1..1cffd57a6c 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -407,17 +407,6 @@ command_add_folder_to_shortcut_bar (BonoboUIComponent *uih,
 	e_shell_command_add_to_shortcut_bar (e_shell_view_get_shell (shell_view), shell_view);
 }
 
-static void
-command_folder_properties (BonoboUIComponent *uih,
-			   void *data,
-			   const char *path)
-{
-	EShellView *shell_view;
-
-	shell_view = E_SHELL_VIEW (data);
-	e_shell_command_folder_properties (e_shell_view_get_shell (shell_view), shell_view);
-}
-
 
 /* Going to a folder.  */
 
@@ -660,8 +649,6 @@ BonoboUIVerb folder_verbs [] = {
 
 	BONOBO_UI_VERB ("AddFolderToShortcutBar", command_add_folder_to_shortcut_bar),
 
-	BONOBO_UI_VERB ("ChangeFolderProperties", command_folder_properties),
-
 	BONOBO_UI_VERB_END
 };
 
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 64ebb0421c..e72b40458d 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-05  Ettore Perazzoli  <ettore@ximian.com>
+
+	* evolution-mail-list.xml: Add the folder properties item back in;
+	use the "ChangeFolderProperties" verb instead.
+
+	* evolution.xml: Removed "Folder Properties" item from the "File"
+	menu.
+
 2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
 
 	* evolution-mail-message.xml: MessageApplyFilters now has an icon.
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 2ce344068f..94579b4324 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -66,16 +66,11 @@
 
   <menu>
 
-<!--
-This already exists in evolution.xml. We merely provide
-the verb.
-
     <submenu name="File">
       <submenu name="Folder" _label="_Folder">
-         <menuitem name="FolderConfig" verb="" _label="_Properties..."/>
+         <menuitem name="ChangeFolderProperties" verb="" _label="_Properties..."/>
       </submenu>
     </submenu>
--->
 
     <submenu name="Edit">
       <placeholder name="MailListEdit">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 956e0aa8ac..dbf26b2c86 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -123,11 +123,6 @@
         <placeholder name="ComponentPlaceholder"
                      delimit="top"/>
 
-        <menuitem name="ChangeFolderProperties"
-                  verb="ChangeFolderProperties"
-                  _label="_Properties..."
-                  _tip="Change the properties for this folder"/>
-
       </submenu>
       
       <menuitem name="FileGoToFolder" verb=""