Skip to content

FolderRow: use icon_name property, code style #1074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 2 commits into from
Aug 5, 2026
Merged

FolderRow: use icon_name property, code style #1074

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ce8025
FolderRow: use icon_name property, code style
danirabbit Aug 5, 2026
24056cc
Merge branch 'master' into danirabbit/folderrow-gtk4prep
danirabbit Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions src/MessageList/FolderPopover/FolderRow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,45 @@ public class Mail.FolderRow : Gtk.ListBoxRow {
}

construct {
var icon = new Gtk.Image.from_icon_name ("folder", MENU) {
margin_end = 3
};
var icon = new Gtk.Image.from_icon_name ("folder", MENU);

var full_folder_info_flags = Utils.get_full_folder_info_flags (store, folder_info);
switch (full_folder_info_flags & Camel.FOLDER_TYPE_MASK) {
case Camel.FolderInfoFlags.TYPE_INBOX:
icon.set_from_icon_name ("mail-inbox", MENU);
case TYPE_INBOX:
icon.icon_name = "mail-inbox";
pos = 1;
break;
case Camel.FolderInfoFlags.TYPE_DRAFTS:
icon.set_from_icon_name ("mail-drafts", MENU);
case TYPE_DRAFTS:
icon.icon_name = "mail-drafts";
pos = 2;
break;
case Camel.FolderInfoFlags.TYPE_OUTBOX:
icon.set_from_icon_name ("mail-outbox", MENU);
case TYPE_OUTBOX:
icon.icon_name = "mail-outbox";
pos = 3;
break;
case Camel.FolderInfoFlags.TYPE_SENT:
icon.set_from_icon_name ("mail-sent", MENU);
case TYPE_SENT:
icon.icon_name = "mail-sent";
pos = 4;
break;
case Camel.FolderInfoFlags.TYPE_ARCHIVE:
icon.set_from_icon_name ("mail-archive", MENU);
case TYPE_ARCHIVE:
icon.icon_name = "mail-archive";
pos = 5;
break;
case Camel.FolderInfoFlags.TYPE_TRASH:
icon.set_from_icon_name (folder_info.total == 0 ? "user-trash" : "user-trash-full", MENU);
case TYPE_TRASH:
icon.icon_name = folder_info.total == 0 ? "user-trash" : "user-trash-full";
pos = 6;
break;
case Camel.FolderInfoFlags.TYPE_JUNK:
icon.set_from_icon_name ("edit-flag", MENU);
case TYPE_JUNK:
icon.icon_name = "edit-flag";
pos = 7;
break;
default:
icon.set_from_icon_name ("folder", MENU);
icon.icon_name = "folder";
pos = 8;
break;
}

var box = new Gtk.Box (HORIZONTAL, 0) {
var box = new Gtk.Box (HORIZONTAL, 6) {
margin_top = 6,
margin_bottom = 6,
margin_start = 12,
Expand Down