[geary/wip/trash-714212] Fix delete icon, button appearance

[Charles Lindsay <clindsay src gnome org>]

commit 110f91e8876bb988a3258d76e42c5254efe34f98
Author: Charles Lindsay <chaz yorba org>
Date:   Thu Dec 19 17:05:03 2013 -0800

    Fix delete icon, button appearance

 src/client/application/geary-controller.vala |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 9dda4cc..57ab2c9 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -44,8 +44,7 @@ public class GearyController : Geary.BaseObject {
     private const string DELETE_MESSAGE_LABEL = _("_Delete");
     private const string DELETE_MESSAGE_TOOLTIP_SINGLE = _("Delete conversation (Shitf+Delete)");
     private const string DELETE_MESSAGE_TOOLTIP_MULTIPLE = _("Delete conversations (Shift+Delete)");
-    // TODO
-    private const string DELETE_MESSAGE_ICON_NAME = "user-trash-symbolic";
+    private const string DELETE_MESSAGE_ICON_NAME = "edit-delete-symbolic";
     
     private const string TRASH_MESSAGE_LABEL = _("_Trash");
     private const string TRASH_MESSAGE_TOOLTIP_SINGLE = _("Move conversation to trash (Delete, Backspace)");
@@ -928,9 +927,9 @@ public class GearyController : Geary.BaseObject {
     // by other utility methods
     private void update_ui() {
         update_tooltips();
-        main_window.main_toolbar.show_archive_button(current_account.can_support_archive());
         // TODO: also replace it with delete when shift is held down
         main_window.main_toolbar.replace_trash_with_delete(!current_folder_supports_trash());
+        main_window.main_toolbar.show_archive_button(current_account.can_support_archive());
     }
     
     private void on_folder_selected(Geary.Folder? folder) {