[geary] Remove ComposerWidget.ComposerState.NEW enum value.



commit 1aa91639b1f36c0b2023f9b2df93ad8cab5604ea
Author: Michael James Gratton <mike vee net>
Date:   Wed Feb 7 11:16:30 2018 +1100

    Remove ComposerWidget.ComposerState.NEW enum value.
    
    * src/client/composer/composer-widget.vala (ComposerState): Remove NEW
      since it doesn't actually describe a useful state and effectively is a
      duplicate of PANED.

 src/client/application/geary-controller.vala |    5 ++---
 src/client/composer/composer-widget.vala     |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index bc9f7b3..524ce1a 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -2210,8 +2210,7 @@ public class GearyController : Geary.BaseObject {
         debug(@"Creating composer of type $(widget.compose_type); $(composer_widgets.size) composers total");
 
         if (inline) {
-            if (widget.state == ComposerWidget.ComposerState.NEW ||
-                widget.state == ComposerWidget.ComposerState.PANED) {
+            if (widget.state == ComposerWidget.ComposerState.PANED) {
                 main_window.conversation_viewer.do_compose(widget);
                 get_window_action(ACTION_FIND_IN_CONVERSATION).set_enabled(false);
             } else {
@@ -2274,7 +2273,7 @@ public class GearyController : Geary.BaseObject {
         // it if it hasn't been modified; otherwise open a new composer in a new window.
         if (compose_type == ComposerWidget.ComposeType.NEW_MESSAGE) {
             foreach (ComposerWidget cw in composer_widgets) {
-                if (cw.state == ComposerWidget.ComposerState.NEW) {
+                if (cw.state == ComposerWidget.ComposerState.PANED) {
                     if (!cw.is_blank) {
                         inline = false;
                         return true;
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index e3e38c8..261f0ef 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -28,11 +28,10 @@ public class ComposerWidget : Gtk.EventBox {
         PENDING_CLOSE,
         CANCEL_CLOSE
     }
-    
+
     public enum ComposerState {
         DETACHED,
         PANED,
-        NEW,
         INLINE,
         INLINE_COMPACT
     }
@@ -389,7 +388,7 @@ public class ComposerWidget : Gtk.EventBox {
         this.config = config;
         this.compose_type = compose_type;
         if (this.compose_type == ComposeType.NEW_MESSAGE)
-            this.state = ComposerState.NEW;
+            this.state = ComposerState.PANED;
         else if (this.compose_type == ComposeType.FORWARD || this.account.information.alternate_mailboxes != 
null)
             this.state = ComposerState.INLINE;
         else


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