[geary/wip/714922-multiple-addresses-2] Code cleanup



commit 05c653233e9625fba72dfec3846da6c25c198c7a
Author: Jim Nelson <jim yorba org>
Date:   Wed Mar 4 17:22:08 2015 -0800

    Code cleanup

 src/client/composer/composer-widget.vala           |   12 +++++-------
 .../conversation-list/conversation-list-store.vala |    1 -
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index bc62249..e34fa53 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -136,7 +136,7 @@ public class ComposerWidget : Gtk.EventBox {
     private delegate bool CompareStringFunc(string key, string token);
     
     public Geary.Account account { get; private set; }
-
+    
     public Geary.RFC822.MailboxAddress sender { get; set; }
     
     public Geary.RFC822.MailboxAddresses from { get; set; }
@@ -886,9 +886,7 @@ public class ComposerWidget : Gtk.EventBox {
     public Geary.ComposedEmail get_composed_email(DateTime? date_override = null,
         bool only_html = false) {
         Geary.ComposedEmail email = new Geary.ComposedEmail(
-            date_override ?? new DateTime.now_local(),
-            from
-        );
+            date_override ?? new DateTime.now_local(), from);
         email.sender = sender;
         
         if (to_entry.addresses != null)
@@ -2266,7 +2264,7 @@ public class ComposerWidget : Gtk.EventBox {
             action_flag = false;
         }
     }
-
+    
     private bool add_account_emails_to_from_list(Geary.Account account, bool set_active = false) {
         Geary.RFC822.MailboxAddresses primary_address = new Geary.RFC822.MailboxAddresses.single(
             account.information.get_primary_mailbox_address());
@@ -2322,13 +2320,13 @@ public class ComposerWidget : Gtk.EventBox {
             return;
         
         from_label.visible = true;
-
+        
         from_label.set_use_underline(true);
         from_label.set_mnemonic_widget(from_multiple);
         // Composer label (with mnemonic underscore) for the account selector
         // when choosing what address to send a message from.
         from_label.set_text_with_mnemonic(_("_From:"));
-
+        
         from_multiple.visible = true;
         from_multiple.remove_all();
         from_list = new Gee.ArrayList<FromAddressMap>();
diff --git a/src/client/conversation-list/conversation-list-store.vala 
b/src/client/conversation-list/conversation-list-store.vala
index 3dfb11c..eca2ced 100644
--- a/src/client/conversation-list/conversation-list-store.vala
+++ b/src/client/conversation-list/conversation-list-store.vala
@@ -68,7 +68,6 @@ public class ConversationListStore : Gtk.ListStore {
         }
     }
     
-    public Gee.List<string>? account_owner_emails { get; set; default = null; }
     public Geary.ProgressMonitor preview_monitor { get; private set; default = 
         new Geary.SimpleProgressMonitor(Geary.ProgressType.ACTIVITY); }
     public bool is_clearing { get; private set; default = false; }


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