[geary/mjog/424-remove-empty-folder-menu-items: 2/2] Application.MainWindow: Remove empty trash/spam menu items

[Michael Gratton <mjog src gnome org>]

commit 1d5e8c831c905d59350faf0caefdca4358220ff8
Author: Michael Gratton <mike vee net>
Date:   Fri Mar 20 18:28:08 2020 +1100

    Application.MainWindow: Remove empty trash/spam menu items
    
    Remove menu items and now-unused callbacks and controller methods.

 src/client/application/application-controller.vala | 26 --------------
 .../application/application-main-window.vala       | 40 ----------------------
 ui/main-toolbar-menus.ui                           | 10 ------
 3 files changed, 76 deletions(-)
---
diff --git a/src/client/application/application-controller.vala 
b/src/client/application/application-controller.vala
index 39f0bf18..c6e5f539 100644
--- a/src/client/application/application-controller.vala
+++ b/src/client/application/application-controller.vala
@@ -854,32 +854,6 @@ internal class Application.Controller : Geary.BaseObject {
         }
     }
 
-    public async void empty_folder_special(Geary.Account source,
-                                           Geary.SpecialFolderType type)
-        throws GLib.Error {
-        AccountContext? context = this.accounts.get(source.information);
-        if (context != null) {
-            Geary.FolderSupport.Empty? emptyable = (
-                source.get_special_folder(type)
-                as Geary.FolderSupport.Empty
-            );
-            if (emptyable == null) {
-                throw new Geary.EngineError.UNSUPPORTED(
-                    "Special folder type not supported %s", type.to_string()
-                );
-            }
-
-            Command command = new EmptyFolderCommand(emptyable);
-            command.executed.connect(
-                // Not quite accurate, but close enough
-                () => context.controller_stack.folders_removed(
-                    Geary.Collection.single(emptyable)
-                )
-            );
-            yield context.commands.execute(command, context.cancellable);
-        }
-    }
-
     internal void register_window(MainWindow window) {
         window.retry_service_problem.connect(on_retry_service_problem);
     }
diff --git a/src/client/application/application-main-window.vala 
b/src/client/application/application-main-window.vala
index 9c7c7afd..491bb86c 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -16,8 +16,6 @@ public class Application.MainWindow :
     public const string ACTION_CONVERSATION_DOWN = "down-conversation";
     public const string ACTION_CONVERSATION_UP = "up-conversation";
     public const string ACTION_DELETE_CONVERSATION = "delete-conversation";
-    public const string ACTION_EMPTY_SPAM = "empty-spam";
-    public const string ACTION_EMPTY_TRASH = "empty-trash";
     public const string ACTION_FIND_IN_CONVERSATION = "find-in-conversation";
     public const string ACTION_FORWARD_CONVERSATION = "forward-conversation";
     public const string ACTION_MARK_AS_READ = "mark-conversation-read";
@@ -44,8 +42,6 @@ public class Application.MainWindow :
 
         { ACTION_FIND_IN_CONVERSATION, on_find_in_conversation_action },
         { ACTION_SEARCH, on_search_activated },
-        { ACTION_EMPTY_SPAM, on_empty_spam },
-        { ACTION_EMPTY_TRASH, on_empty_trash },
         // Message actions
         { ACTION_REPLY_CONVERSATION, on_reply_conversation },
         { ACTION_REPLY_ALL_CONVERSATION, on_reply_all_conversation },
@@ -2457,42 +2453,6 @@ public class Application.MainWindow :
         }
     }
 
-    private void on_empty_spam() {
-        Geary.Account? account = this.selected_account;
-        if (account != null &&
-            prompt_empty_folder(Geary.SpecialFolderType.SPAM)) {
-            this.controller.empty_folder_special.begin(
-                account,
-                Geary.SpecialFolderType.SPAM,
-                (obj, res) => {
-                    try {
-                        this.controller.empty_folder_special.end(res);
-                } catch (GLib.Error err) {
-                        handle_error(account.information, err);
-                    }
-                }
-            );
-        }
-    }
-
-    private void on_empty_trash() {
-        Geary.Account? account = this.selected_account;
-        if (account != null &&
-            prompt_empty_folder(Geary.SpecialFolderType.TRASH)) {
-            this.controller.empty_folder_special.begin(
-                account,
-                Geary.SpecialFolderType.TRASH,
-                (obj, res) => {
-                    try {
-                        this.controller.empty_folder_special.end(res);
-                    } catch (GLib.Error err) {
-                        handle_error(account.information, err);
-                    }
-                }
-            );
-        }
-    }
-
     // Individual conversation email view action callbacks
 
     private void on_email_mark(ConversationListBox view,
diff --git a/ui/main-toolbar-menus.ui b/ui/main-toolbar-menus.ui
index 68f9959a..a5ed964c 100644
--- a/ui/main-toolbar-menus.ui
+++ b/ui/main-toolbar-menus.ui
@@ -23,16 +23,6 @@
     </item>
   </menu>
   <menu id="main_menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Empty _Spam…</attribute>
-        <attribute name="action">win.empty-spam</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Empty _Trash…</attribute>
-        <attribute name="action">win.empty-trash</attribute>
-      </item>
-    </section>
     <section>
       <item>
         <attribute name="label" translatable="yes">_Accounts</attribute>