evolution-data-server r8857 - branches/gnome-2-22/camel

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Tue May 27 07:05:05 2008
New Revision: 8857
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8857&view=rev

Log:
2008-05-27  Hiroyuki Ikezoe  <poincare ikezoe net>

	** Fixes bug #534294

	* camel-folder-search.[ch]: Added accessor to _camel_header_param.
	* camel-filter-search.c: Use camel_message_info_headers() instead of
	direct access (i.e. ->headers) since the message does not have
	headers' pointer if the message is in vitrual folder.




Modified:
   branches/gnome-2-22/camel/ChangeLog
   branches/gnome-2-22/camel/camel-filter-search.c
   branches/gnome-2-22/camel/camel-folder-summary.c
   branches/gnome-2-22/camel/camel-folder-summary.h

Modified: branches/gnome-2-22/camel/camel-filter-search.c
==============================================================================
--- branches/gnome-2-22/camel/camel-filter-search.c	(original)
+++ branches/gnome-2-22/camel/camel-filter-search.c	Tue May 27 07:05:05 2008
@@ -649,7 +649,7 @@
 	d(printf("doing junk test for message from '%s'\n", camel_message_info_from (fms->info)));
 	if (fms->session->junk_plugin != NULL && (camel_message_info_flags (info) & (CAMEL_MESSAGE_JUNK | CAMEL_MESSAGE_NOTJUNK)) == 0) {
 		const GHashTable *ht = camel_session_get_junk_headers (fms->session);
-		struct _camel_header_param *node = ((CamelMessageInfoBase *)info)->headers;
+		const struct _camel_header_param *node = camel_message_info_headers (info);
 
 		while (node && !retval) {
 			if (node->name) {

Modified: branches/gnome-2-22/camel/camel-folder-summary.c
==============================================================================
--- branches/gnome-2-22/camel/camel-folder-summary.c	(original)
+++ branches/gnome-2-22/camel/camel-folder-summary.c	Tue May 27 07:05:05 2008
@@ -2927,6 +2927,8 @@
 		return ((const CamelMessageInfoBase *)mi)->user_flags;
 	case CAMEL_MESSAGE_INFO_USER_TAGS:
 		return ((const CamelMessageInfoBase *)mi)->user_tags;
+	case CAMEL_MESSAGE_INFO_HEADERS:
+		return ((const CamelMessageInfoBase *)mi)->headers;
 	default:
 		abort();
 	}

Modified: branches/gnome-2-22/camel/camel-folder-summary.h
==============================================================================
--- branches/gnome-2-22/camel/camel-folder-summary.h	(original)
+++ branches/gnome-2-22/camel/camel-folder-summary.h	Tue May 27 07:05:05 2008
@@ -140,6 +140,8 @@
 	CAMEL_MESSAGE_INFO_USER_FLAGS,
 	CAMEL_MESSAGE_INFO_USER_TAGS,
 
+	CAMEL_MESSAGE_INFO_HEADERS,
+
 	CAMEL_MESSAGE_INFO_LAST
 };
 
@@ -394,6 +396,8 @@
 #define camel_message_info_user_flags(mi) ((const CamelFlag *)camel_message_info_ptr((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_USER_FLAGS))
 #define camel_message_info_user_tags(mi) ((const CamelTag *)camel_message_info_ptr((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_USER_TAGS))
 
+#define camel_message_info_headers(mi) ((const struct _camel_header_param *)camel_message_info_ptr((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_HEADERS))
+
 gboolean camel_message_info_user_flag(const CamelMessageInfo *mi, const char *id);
 const char *camel_message_info_user_tag(const CamelMessageInfo *mi, const char *id);