[geary] Check for inline composers before archive or trash



commit 9f37ef720ff12e9fa56c11e064987313019bddfd
Author: Robert Schroll <rschroll gmail com>
Date:   Sat Aug 23 12:35:59 2014 -0400

    Check for inline composers before archive or trash
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733340

 src/client/application/geary-controller.vala |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 94e5779..e0de0d1 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -2265,6 +2265,9 @@ public class GearyController : Geary.BaseObject {
     
     private async void archive_or_delete_selection_async(bool archive, bool trash,
         Cancellable? cancellable) throws Error {
+        if (!can_switch_conversation_view())
+            return;
+        
         if (main_window.conversation_viewer.current_conversation != null
             && main_window.conversation_viewer.current_conversation == last_deleted_conversation) {
             debug("Not archiving/trashing/deleting; viewed conversation is last deleted conversation");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]