aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-folder.h1
-rw-r--r--camel/providers/mbox/camel-mbox-search.c2
-rw-r--r--camel/providers/mbox/camel-mbox-summary.c4
4 files changed, 9 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index a940175068..96aae92593 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -10,6 +10,7 @@
api.
(struct _searchcontext): Removed cancelled flag.
(find_context): Removed.
+ (func_header_contains): Debug out some search stuff.
* providers/mbox/camel-mbox-search.h
(camel_mbox_folder_search_by_expression): Moved back to sync api.
@@ -23,6 +24,9 @@
(camel_mbox_summary_remove_uid): Remove a message summary entry by
uid.
(index_folder): Restore flags from X-Evolution header, if they are set.
+ (index_folder): Make sure we index using a decimal uid, since
+ thats what everything else indexes off (oops).
+ Upped SUMMARY_VERSION as a result.
* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
Connect to the message_changed signal.
@@ -48,6 +52,8 @@
(CamelFolderClass): New function summary_get_by_uid() to get a single
summary.
(*search*): Moved back to synchronous search api ... *sigh*
+
+ * camel-folder.h: Removed CamelSearchFunc.
* camel-mime-message.c (set_flag): Removed.
(camel_mime_message_set_flag): Removed.
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index b96f3e819c..f7bfc8a490 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -57,7 +57,6 @@ typedef enum {
typedef void (*CamelFolderAsyncCallback) ();
-typedef void (CamelSearchFunc)(CamelFolder *folder, int id, gboolean complete, GList *matches, void *data);
/* these structs from camel-folder-summary.h ... (remove comment after cleanup soon) */
/* TODO: perhaps they should be full-block objects? */
diff --git a/camel/providers/mbox/camel-mbox-search.c b/camel/providers/mbox/camel-mbox-search.c
index 094533edbd..107984d75b 100644
--- a/camel/providers/mbox/camel-mbox-search.c
+++ b/camel/providers/mbox/camel-mbox-search.c
@@ -240,7 +240,7 @@ func_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, voi
for (i=1;i<argc && !truth;i++) {
if (argv[i]->type == ESEXP_RES_STRING
&& strstr(header, argv[i]->value.string)) {
- printf("%s got a match with %s of %s\n", ctx->message_current->info.uid, header, argv[i]->value.string);
+ r(printf("%s got a match with %s of %s\n", ctx->message_current->info.uid, header, argv[i]->value.string));
truth = TRUE;
break;
}
diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c
index 4d10709fcd..b4b341fd40 100644
--- a/camel/providers/mbox/camel-mbox-summary.c
+++ b/camel/providers/mbox/camel-mbox-summary.c
@@ -47,7 +47,7 @@
#define d(x)
-#define CAMEL_MBOX_SUMMARY_VERSION 2
+#define CAMEL_MBOX_SUMMARY_VERSION 3
static int safe_write(int fd, char *buffer, size_t towrite);
static void camel_mbox_summary_add(CamelMboxSummary *s, CamelMboxMessageInfo *info);
@@ -807,7 +807,7 @@ static int index_folder(CamelMboxSummary *s, int startoffset)
}
/* setup index name for this uid */
- sprintf(name, "%x", newuid);
+ sprintf(name, "%u", newuid);
camel_mime_filter_index_set_name(mfi, name);
/* remove all references to this name from the index */
if (s->index)