Mail

Merge lp:~benwaffle/pantheon-mail/little-things into lp:~elementary-apps/pantheon-mail/trunk

  1. little-things
  2. Merge into trunk
Proposed by Ben
Status: Merged
Approved by: Danielle Foré
Approved revision: 1993
Merged at revision: 1994
Proposed branch: lp:~benwaffle/pantheon-mail/little-things
Merge into: lp:~elementary-apps/pantheon-mail/trunk
Diff against target: 24 lines (+3/-1)
2 files modified
src/client/folder-list/folder-list-folder-entry.vala (+1/-1)
src/client/sidebar/sidebar-tree.vala (+2/-0)
To merge this branch: bzr merge lp:~benwaffle/pantheon-mail/little-things
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+287878@code.launchpad.net

Commit message

Use trash full/empty icons

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/folder-list/folder-list-folder-entry.vala'
2--- src/client/folder-list/folder-list-folder-entry.vala 2015-11-24 06:04:15 +0000
3+++ src/client/folder-list/folder-list-folder-entry.vala 2016-03-03 06:45:05 +0000
4@@ -74,7 +74,7 @@
5 return "edit-flag";
6
7 case Geary.SpecialFolderType.TRASH:
8- return "user-trash";
9+ return folder.properties.email_total == 0 ? "user-trash" : "user-trash-full";
10
11 case Geary.SpecialFolderType.OUTBOX:
12 return "mail-outbox";
13
14=== modified file 'src/client/sidebar/sidebar-tree.vala'
15--- src/client/sidebar/sidebar-tree.vala 2015-02-06 20:43:33 +0000
16+++ src/client/sidebar/sidebar-tree.vala 2016-03-03 06:45:05 +0000
17@@ -757,6 +757,8 @@
18 EntryWrapper? wrapper = get_wrapper(entry);
19 assert(wrapper != null);
20
21+ // update the icon e.g. for trash empty & full
22+ store.set(wrapper.get_iter(), Columns.ICON, entry.get_sidebar_icon());
23 store.set(wrapper.get_iter(), Columns.COUNTER, entry.get_count());
24 }
25

Subscribers

People subscribed via source and target branches