alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu: fix pre-condition warning when getting related messages without threads

Browse Source
This commit is contained in:
djcb
2013-03-16 18:25:19 +02:00
parent dbbcaf0f2b
commit 342195a248
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mu-msg-iter.cc
View File

@ -405,7 +405,10 @@ const MuMsgIterThreadInfo*
mu_msg_iter_get_thread_info (MuMsgIter *iter) mu_msg_iter_get_thread_info (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
g_return_val_if_fail (iter->thread_hash(), NULL);
/* maybe we don't have thread info */
if (!iter->thread_hash())
return NULL;
try { try {
const MuMsgIterThreadInfo *ti; const MuMsgIterThreadInfo *ti;

1
lib/mu-msg-iter.h
View File

@ -179,6 +179,7 @@ typedef struct _MuMsgIterThreadInfo MuMsgIterThreadInfo;
/** /**
* get a the MuMsgThreaderInfo struct for this message; this only * get a the MuMsgThreaderInfo struct for this message; this only
* works when you created the mu-msg-iter with threading enabled * works when you created the mu-msg-iter with threading enabled
* (otherwise, return NULL)
* *
* @param iter a valid MuMsgIter iterator * @param iter a valid MuMsgIter iterator
* *

2
mu/mu-cmd.c
View File

@ -529,7 +529,7 @@ show_usage (void)
{ {
g_print ("usage: mu command [options] [parameters]\n"); g_print ("usage: mu command [options] [parameters]\n");
g_print ("where command is one of index, find, cfind, view, mkdir, " g_print ("where command is one of index, find, cfind, view, mkdir, "
"extract, add, remove, stats, verify or server\n"); "extract, add, remove, script, verify or server\n");
g_print ("see the mu, mu-<command> or mu-easy manpages for " g_print ("see the mu, mu-<command> or mu-easy manpages for "
"more information\n"); "more information\n");
} }