[geary/wip/713739-inline: 28/37] Don't focus on a detached composer instead of creating a new one



commit 02e31c2a738d05e7eb87df22e625d94ff2b6ce2c
Author: Robert Schroll <rschroll gmail com>
Date:   Fri May 16 12:24:42 2014 -0700

    Don't focus on a detached composer instead of creating a new one

 src/client/application/geary-controller.vala |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 377a6ff..df44d3a 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1848,12 +1848,9 @@ public class GearyController : Geary.BaseObject {
     public bool should_create_new_composer(
         ComposerWidget.ComposeType compose_type = ComposerWidget.ComposeType.NEW_MESSAGE,
         Geary.Email? referred = null) {
-        if (!any_inline_composers())
-            return true;
-        
         if (compose_type != ComposerWidget.ComposeType.NEW_MESSAGE) {
             foreach (ComposerWidget cw in composer_widgets) {
-                if (referred != null && referred.id.equal_to(cw.referred_id)) {
+                if (cw.inline && referred != null && referred.id.equal_to(cw.referred_id)) {
                     cw.change_compose_type(compose_type);
                     return false;
                 }
@@ -1861,6 +1858,9 @@ public class GearyController : Geary.BaseObject {
             return true;
         }
         
+        if (!any_inline_composers())
+            return true;
+        
         // TODO: Remove this in favor of automatically saving drafts
         main_window.present();
         AlertDialog dialog;


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