aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2003-11-04 00:13:21 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-11-04 00:13:21 +0800
commitc7b4440e3b45637890a451b58a50b2ca8b119920 (patch)
tree0ea299e9306a139aba79db09aa037c56b23a9f69 /mail
parent240bdec15b67fad09e0213974cfe1f6b9f6587e1 (diff)
downloadgsoc2013-evolution-c7b4440e3b45637890a451b58a50b2ca8b119920.tar
gsoc2013-evolution-c7b4440e3b45637890a451b58a50b2ca8b119920.tar.gz
gsoc2013-evolution-c7b4440e3b45637890a451b58a50b2ca8b119920.tar.bz2
gsoc2013-evolution-c7b4440e3b45637890a451b58a50b2ca8b119920.tar.lz
gsoc2013-evolution-c7b4440e3b45637890a451b58a50b2ca8b119920.tar.xz
gsoc2013-evolution-c7b4440e3b45637890a451b58a50b2ca8b119920.tar.zst
gsoc2013-evolution-c7b4440e3b45637890a451b58a50b2ca8b119920.zip
fixed the build
svn path=/trunk/; revision=23169
Diffstat (limited to 'mail')
-rw-r--r--mail/em-folder-view.c4
-rw-r--r--mail/mail-autofilter.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index da015f976e..0c52a49fe1 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -704,7 +704,7 @@ static EMPopupItem emfv_popup_menu[] = {
{ EM_POPUP_ITEM, "90.filter.00/00.03", N_("VFolder on Mailing _List"),
G_CALLBACK(emfv_popup_vfolder_mlist), NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST },
{ EM_POPUP_ITEM, "90.filter.00/00.04", N_("VFolder on Thread"),
- G_CALLBACK(emfv_popup_vfolder_thread), NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_THREAD },
+ G_CALLBACK(emfv_popup_vfolder_thread), NULL, NULL, EM_POPUP_SELECT_ONE },
{ EM_POPUP_BAR, "90.filter.00/10", NULL, NULL, NULL, NULL, EM_POPUP_SELECT_ONE },
{ EM_POPUP_ITEM, "90.filter.00/10.00", N_("Filter on Sub_ject"), G_CALLBACK(emfv_popup_filter_subject), NULL, NULL, EM_POPUP_SELECT_ONE },
@@ -713,7 +713,7 @@ static EMPopupItem emfv_popup_menu[] = {
{ EM_POPUP_ITEM, "90.filter.00/10.03", N_("Filter on _Mailing List"),
G_CALLBACK(emfv_popup_filter_mlist), NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST },
{ EM_POPUP_ITEM, "90.filter.00/10.04", N_("Filter on Thread"),
- G_CALLBACK(emfv_popup_filter_thread), NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_THREAD },
+ G_CALLBACK(emfv_popup_filter_thread), NULL, NULL, EM_POPUP_SELECT_ONE },
};
static void
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index dbf2002a3d..06149ed3dd 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -293,12 +293,12 @@ rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg
g_free(mlist);
}
if (flags & AUTO_THREAD) {
- char *name, *msgid = nULL;
- const char *refs = NULL;
+ const char *msgid, *refs = NULL;
+ char *name;
if (!(refs = camel_medium_get_header ((CamelMedium *) msg, "References"))) {
if (!(refs = camel_medium_get_header ((CamelMedium *) msg, "In-Reply-To")))
- msgid = camel_message_get_message_id (msg);
+ msgid = camel_mime_message_get_message_id (msg);
}
if (refs || msgid) {