mirror of https://github.com/djcb/mu.git
parent
1a13e4f0fd
commit
4f81f04d24
|
@ -18,6 +18,7 @@
|
|||
*/
|
||||
|
||||
#include "mug-msg-list-view.h"
|
||||
#include "mu-message-flags.hh"
|
||||
#include "mu-query.hh"
|
||||
#include "utils/mu-str.h"
|
||||
#include "utils/mu-date.h"
|
||||
|
@ -121,18 +122,19 @@ treecell_func(GtkTreeViewColumn* tree_column,
|
|||
GtkTreeIter* iter,
|
||||
gpointer data)
|
||||
{
|
||||
MuFlags flags;
|
||||
MuMsgPrio prio;
|
||||
|
||||
MessageFlags flags;
|
||||
MessagePriority prio;
|
||||
|
||||
gtk_tree_model_get(tree_model, iter, MUG_COL_FLAGS, &flags, MUG_COL_PRIO, &prio, -1);
|
||||
|
||||
g_object_set(G_OBJECT(renderer),
|
||||
"weight",
|
||||
(flags & MU_FLAG_NEW) ? 800 : 400,
|
||||
any_of(flags & MessageFlags::New) ? 800 : 400,
|
||||
"weight",
|
||||
(flags & MU_FLAG_SEEN) ? 400 : 800,
|
||||
any_of(flags & MessageFlags::Seen) ? 400 : 800,
|
||||
"foreground",
|
||||
prio == MU_MSG_PRIO_HIGH ? "red" : NULL,
|
||||
prio == MessagePriority::High ? "red" : NULL,
|
||||
NULL);
|
||||
}
|
||||
|
||||
|
@ -304,9 +306,8 @@ static Mu::Option<Mu::QueryResults>
|
|||
run_query(const char* xpath, const char* expr, MugMsgListView* self)
|
||||
{
|
||||
Mu::Store store{xpath};
|
||||
Mu::Query query{store};
|
||||
|
||||
return query.run(expr,
|
||||
return store.run_query(expr,
|
||||
MU_MSG_FIELD_ID_DATE,
|
||||
Mu::QueryFlags::Descending | Mu::QueryFlags::SkipUnreadable |
|
||||
Mu::QueryFlags::SkipDuplicates | Mu::QueryFlags::IncludeRelated |
|
||||
|
@ -316,15 +317,17 @@ run_query(const char* xpath, const char* expr, MugMsgListView* self)
|
|||
static void
|
||||
add_row(GtkTreeStore* store, MuMsg* msg, GtkTreeIter* treeiter)
|
||||
{
|
||||
const gchar *datestr, *flagstr;
|
||||
const gchar *datestr;
|
||||
gchar * from, *to;
|
||||
time_t timeval;
|
||||
std::string flag_str;
|
||||
|
||||
timeval = mu_msg_get_date(msg);
|
||||
datestr = timeval == 0 ? "-" : mu_date_display_s(timeval);
|
||||
from = empty_or_display_contact(mu_msg_get_from(msg));
|
||||
to = empty_or_display_contact(mu_msg_get_to(msg));
|
||||
flagstr = mu_flags_to_str_s(mu_msg_get_flags(msg), MU_FLAG_TYPE_ANY);
|
||||
|
||||
flag_str = message_flags_to_string(mu_msg_get_flags(msg));
|
||||
|
||||
/* if (0) { */
|
||||
/* GtkTreeIter myiter; */
|
||||
|
@ -341,7 +344,7 @@ add_row(GtkTreeStore* store, MuMsg* msg, GtkTreeIter* treeiter)
|
|||
MUG_COL_MAILDIR,
|
||||
mu_msg_get_maildir(msg),
|
||||
MUG_COL_FLAGSSTR,
|
||||
flagstr,
|
||||
flag_str.c_str(),
|
||||
MUG_COL_FROM,
|
||||
from,
|
||||
MUG_COL_TO,
|
||||
|
|
Loading…
Reference in New Issue