[geary/wip/765516-gtk-widget-conversation-viewer: 15/58] Minor code cleanup.

[Michael Gratton <mjog src gnome org>]

commit f85b4d7d3db91d393f32cf42122c64c7a600097c
Author: Michael James Gratton <mike vee net>
Date:   Tue Apr 12 01:15:38 2016 +1000

    Minor code cleanup.
    
    * src/client/components/main-window.vala (ComposerBox): Remove obsolete
      theme CSS.
    
    * src/client/conversation-viewer/conversation-viewer.vala
      (ConversationViewer): Update some comments, re-organise some code.

 src/client/components/main-window.vala             |   14 +-------------
 .../conversation-viewer/conversation-viewer.vala   |   13 ++++++-------
 2 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index e4e79a8..166355f 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -166,19 +166,7 @@ public class MainWindow : Gtk.ApplicationWindow {
             .sidebar-pane-separator.vertical .conversation-frame {
                 border-left-width: 0px;
             }
-            ComposerBox {
-                border-left-width: 0px;
-                border-right-width: 0px;
-                border-bottom-width: 0px;
-            }
-            ComposerBox.full-pane {
-                border-top-width: 0px;
-            }
-            ComposerEmbed GtkHeaderBar,
-            ComposerBox GtkHeaderBar,
-            GtkBox.vertical GtkHeaderBar {
-                border-radius: 0px;
-            }
+
             .geary-titlebar-left:dir(ltr),
             .geary-titlebar-right:dir(rtl) {
                 border-top-right-radius: 0px;
diff --git a/src/client/conversation-viewer/conversation-viewer.vala 
b/src/client/conversation-viewer/conversation-viewer.vala
index 62b108c..94f79f7 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -106,11 +106,11 @@ public class ConversationViewer : Gtk.Stack {
     [GtkChild]
     private Gtk.Label user_message_label;
 
-    // List of emails in this view.
+    // Sorted set of emails being displayed
     private Gee.TreeSet<Geary.Email> messages { get; private set; default = 
         new Gee.TreeSet<Geary.Email>(Geary.Email.compare_sent_date_ascending); }
     
-    // Maps emails to their corresponding ListBoxRow.
+    // Maps displayed emails to their corresponding ListBoxRow.
     private Gee.HashMap<Geary.EmailIdentifier, Gtk.ListBoxRow> email_to_row = new
         Gee.HashMap<Geary.EmailIdentifier, Gtk.ListBoxRow>();
     
@@ -568,11 +568,10 @@ public class ConversationViewer : Gtk.Stack {
     }
     
     private void add_message(Geary.Email email, bool is_in_folder) {
-        // Ensure the message container is showing and the multi-message counter hidden.
-        set_visible_child(conversation_page);
-        
-        if (messages.contains(email))
+        if (messages.contains(email)) {
             return;
+        }
+        messages.add(email);
 
         ConversationMessage message = new ConversationMessage(email, current_folder);
         message.link_selected.connect((link) => { link_selected(link); });
@@ -587,9 +586,9 @@ public class ConversationViewer : Gtk.Stack {
         row.get_style_context().add_class("frame");
         row.show();
         row.add(message);
+
         conversation_listbox.add(row);
 
-        messages.add(email);
         email_to_row.set(email.id, row);
 
         if (email.is_unread() == Geary.Trillian.TRUE) {