|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
--- evolution-data-server-1.11.2/camel/camel-text-index.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.2/camel/camel-text-index.c 2007-05-18 10:59:21.000000000 -0400
|
|
|
|
|
@@ -70,7 +70,7 @@
|
|
|
|
|
--- evolution-data-server-1.11.3/camel/camel-text-index.c.kill-ememory 2007-06-01 03:06:38.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.3/camel/camel-text-index.c 2007-06-04 12:28:31.000000000 -0400
|
|
|
|
|
@@ -70,7 +70,7 @@ typedef struct _CamelTextIndexNamePrivat
|
|
|
|
|
struct _CamelTextIndexNamePrivate {
|
|
|
|
|
GString *buffer;
|
|
|
|
|
camel_key_t nameid;
|
|
|
|
@ -9,7 +9,7 @@
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
CamelTextIndexName *camel_text_index_name_new(CamelTextIndex *idx, const char *name, camel_key_t nameid);
|
|
|
|
|
@@ -1373,7 +1373,7 @@
|
|
|
|
|
@@ -1374,7 +1374,7 @@ text_index_name_add_word(CamelIndexName
|
|
|
|
|
struct _CamelTextIndexNamePrivate *p = ((CamelTextIndexName *)idn)->priv;
|
|
|
|
|
|
|
|
|
|
if (g_hash_table_lookup(idn->words, word) == NULL) {
|
|
|
|
@ -18,7 +18,7 @@
|
|
|
|
|
|
|
|
|
|
g_hash_table_insert(idn->words, w, w);
|
|
|
|
|
}
|
|
|
|
|
@@ -1501,7 +1501,7 @@
|
|
|
|
|
@@ -1502,7 +1502,7 @@ camel_text_index_name_init(CamelTextInde
|
|
|
|
|
|
|
|
|
|
p = idn->priv = g_malloc0(sizeof(*idn->priv));
|
|
|
|
|
p->buffer = g_string_new("");
|
|
|
|
@ -27,7 +27,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
@@ -1512,7 +1512,7 @@
|
|
|
|
|
@@ -1513,7 +1513,7 @@ camel_text_index_name_finalise(CamelText
|
|
|
|
|
g_hash_table_destroy(idn->parent.words);
|
|
|
|
|
|
|
|
|
|
g_string_free(p->buffer, TRUE);
|
|
|
|
@ -36,7 +36,7 @@
|
|
|
|
|
|
|
|
|
|
g_free(p);
|
|
|
|
|
}
|
|
|
|
|
@@ -1544,7 +1544,7 @@
|
|
|
|
|
@@ -1545,7 +1545,7 @@ camel_text_index_name_new(CamelTextIndex
|
|
|
|
|
|
|
|
|
|
cin->index = (CamelIndex *)idx;
|
|
|
|
|
camel_object_ref((CamelObject *)idx);
|
|
|
|
@ -45,9 +45,9 @@
|
|
|
|
|
p->nameid = nameid;
|
|
|
|
|
|
|
|
|
|
return idn;
|
|
|
|
|
--- evolution-data-server-1.11.2/camel/camel-mime-parser.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.2/camel/camel-mime-parser.c 2007-05-18 10:59:21.000000000 -0400
|
|
|
|
|
@@ -120,7 +120,7 @@
|
|
|
|
|
--- evolution-data-server-1.11.3/camel/camel-mime-parser.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.3/camel/camel-mime-parser.c 2007-06-04 12:28:31.000000000 -0400
|
|
|
|
|
@@ -120,7 +120,7 @@ struct _header_scan_stack {
|
|
|
|
|
camel_mime_parser_state_t savestate; /* state at invocation of this part */
|
|
|
|
|
|
|
|
|
|
#ifdef MEMPOOL
|
|
|
|
@ -56,7 +56,7 @@
|
|
|
|
|
#endif
|
|
|
|
|
struct _camel_header_raw *headers; /* headers for this part */
|
|
|
|
|
|
|
|
|
|
@@ -999,7 +999,8 @@
|
|
|
|
|
@@ -999,7 +999,8 @@ folder_pull_part(struct _header_scan_sta
|
|
|
|
|
s->parts = h->parent;
|
|
|
|
|
g_free(h->boundary);
|
|
|
|
|
#ifdef MEMPOOL
|
|
|
|
@ -66,7 +66,7 @@
|
|
|
|
|
#else
|
|
|
|
|
camel_header_raw_clear(&h->headers);
|
|
|
|
|
#endif
|
|
|
|
|
@@ -1107,20 +1108,16 @@
|
|
|
|
|
@@ -1107,20 +1108,16 @@ header_append_mempool(struct _header_sca
|
|
|
|
|
content = strchr(header, ':');
|
|
|
|
|
if (content) {
|
|
|
|
|
register int len;
|
|
|
|
@ -90,7 +90,7 @@
|
|
|
|
|
|
|
|
|
|
n->offset = offset;
|
|
|
|
|
|
|
|
|
|
@@ -1178,7 +1175,7 @@
|
|
|
|
|
@@ -1178,7 +1175,7 @@ folder_scan_header(struct _header_scan_s
|
|
|
|
|
|
|
|
|
|
h = g_malloc0(sizeof(*h));
|
|
|
|
|
#ifdef MEMPOOL
|
|
|
|
@ -99,27 +99,27 @@
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (s->parts)
|
|
|
|
|
--- evolution-data-server-1.11.2/camel/camel-folder.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.2/camel/camel-folder.c 2007-05-18 10:59:24.000000000 -0400
|
|
|
|
|
@@ -1894,7 +1894,7 @@
|
|
|
|
|
struct _CamelFolderChangeInfoPrivate {
|
|
|
|
|
--- evolution-data-server-1.11.3/camel/camel-folder.c.kill-ememory 2007-06-04 01:40:57.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.3/camel/camel-folder.c 2007-06-04 12:30:21.000000000 -0400
|
|
|
|
|
@@ -1755,7 +1755,7 @@ struct _CamelFolderChangeInfoPrivate {
|
|
|
|
|
GHashTable *uid_stored; /* what we have stored, which array they're in */
|
|
|
|
|
GHashTable *uid_source; /* used to create unique lists */
|
|
|
|
|
GPtrArray *uid_filter; /* uids to be filtered */
|
|
|
|
|
- struct _EMemPool *uid_pool; /* pool used to store copies of uid strings */
|
|
|
|
|
+ GStringChunk *uid_string_chunk; /* used to store copies of uid strings */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1921,7 +1921,7 @@
|
|
|
|
|
info->priv = g_malloc0(sizeof(*info->priv));
|
|
|
|
|
@@ -1934,7 +1934,7 @@ camel_folder_change_info_new(void)
|
|
|
|
|
info->priv->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
|
info->priv->uid_source = NULL;
|
|
|
|
|
info->priv->uid_filter = g_ptr_array_new();
|
|
|
|
|
- info->priv->uid_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
|
|
|
|
|
+ info->priv->uid_string_chunk = g_string_chunk_new(512);
|
|
|
|
|
|
|
|
|
|
return info;
|
|
|
|
|
}
|
|
|
|
|
@@ -1947,7 +1947,7 @@
|
|
|
|
|
@@ -1960,7 +1960,7 @@ camel_folder_change_info_add_source(Came
|
|
|
|
|
p->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
|
|
|
|
|
|
if (g_hash_table_lookup(p->uid_source, uid) == NULL)
|
|
|
|
@ -128,7 +128,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1976,7 +1976,7 @@
|
|
|
|
|
@@ -1989,7 +1989,7 @@ camel_folder_change_info_add_source_list
|
|
|
|
|
char *uid = list->pdata[i];
|
|
|
|
|
|
|
|
|
|
if (g_hash_table_lookup(p->uid_source, uid) == NULL)
|
|
|
|
@ -137,7 +137,25 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -2136,7 +2136,7 @@
|
|
|
|
|
@@ -2101,7 +2101,7 @@ change_info_recent_uid(CamelFolderChange
|
|
|
|
|
|
|
|
|
|
/* always add to recent, but dont let anyone else know */
|
|
|
|
|
if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
|
|
|
|
|
- olduid = e_mempool_strdup(p->uid_pool, uid);
|
|
|
|
|
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
|
|
|
|
|
}
|
|
|
|
|
g_ptr_array_add(info->uid_recent, olduid);
|
|
|
|
|
}
|
|
|
|
|
@@ -2117,7 +2117,7 @@ change_info_filter_uid(CamelFolderChange
|
|
|
|
|
|
|
|
|
|
/* always add to filter, but dont let anyone else know */
|
|
|
|
|
if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
|
|
|
|
|
- olduid = e_mempool_strdup(p->uid_pool, uid);
|
|
|
|
|
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
|
|
|
|
|
}
|
|
|
|
|
g_ptr_array_add(p->uid_filter, olduid);
|
|
|
|
|
}
|
|
|
|
|
@@ -2182,7 +2182,7 @@ camel_folder_change_info_add_uid(CamelFo
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -146,7 +164,7 @@
|
|
|
|
|
g_ptr_array_add(info->uid_added, olduid);
|
|
|
|
|
g_hash_table_insert(p->uid_stored, olduid, info->uid_added);
|
|
|
|
|
}
|
|
|
|
|
@@ -2170,7 +2170,7 @@
|
|
|
|
|
@@ -2216,7 +2216,7 @@ camel_folder_change_info_remove_uid(Came
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -155,7 +173,7 @@
|
|
|
|
|
g_ptr_array_add(info->uid_removed, olduid);
|
|
|
|
|
g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
|
|
|
|
|
}
|
|
|
|
|
@@ -2199,7 +2199,7 @@
|
|
|
|
|
@@ -2245,7 +2245,7 @@ camel_folder_change_info_change_uid(Came
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -164,37 +182,28 @@
|
|
|
|
|
g_ptr_array_add(info->uid_changed, olduid);
|
|
|
|
|
g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
|
|
|
|
|
}
|
|
|
|
|
@@ -2225,7 +2225,7 @@
|
|
|
|
|
|
|
|
|
|
/* always add to recent, but dont let anyone else know */
|
|
|
|
|
if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
|
|
|
|
|
- olduid = e_mempool_strdup(p->uid_pool, uid);
|
|
|
|
|
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
|
|
|
|
|
}
|
|
|
|
|
g_ptr_array_add(info->uid_recent, olduid);
|
|
|
|
|
}
|
|
|
|
|
@@ -2274,7 +2274,8 @@
|
|
|
|
|
}
|
|
|
|
|
@@ -2314,7 +2314,8 @@ camel_folder_change_info_clear(CamelFold
|
|
|
|
|
g_hash_table_destroy(p->uid_stored);
|
|
|
|
|
p->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
|
g_ptr_array_set_size(p->uid_filter, 0);
|
|
|
|
|
- e_mempool_flush(p->uid_pool, TRUE);
|
|
|
|
|
+ g_string_chunk_free(p->uid_string_chunk);
|
|
|
|
|
+ p->uid_string_chunk = g_string_chunk_new(512);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2297,7 +2298,7 @@
|
|
|
|
|
g_hash_table_destroy(p->uid_source);
|
|
|
|
|
@@ -2338,7 +2339,7 @@ camel_folder_change_info_free(CamelFolde
|
|
|
|
|
|
|
|
|
|
g_hash_table_destroy(p->uid_stored);
|
|
|
|
|
g_ptr_array_free(p->uid_filter, TRUE);
|
|
|
|
|
- e_mempool_destroy(p->uid_pool);
|
|
|
|
|
+ g_string_chunk_free(p->uid_string_chunk);
|
|
|
|
|
g_free(p);
|
|
|
|
|
|
|
|
|
|
g_ptr_array_free(info->uid_added, TRUE);
|
|
|
|
|
--- evolution-data-server-1.11.2/camel/camel-folder-summary.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.2/camel/camel-folder-summary.c 2007-05-18 10:59:24.000000000 -0400
|
|
|
|
|
@@ -134,10 +134,6 @@
|
|
|
|
|
--- evolution-data-server-1.11.3/camel/camel-folder-summary.c.kill-ememory 2007-06-01 03:06:38.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.3/camel/camel-folder-summary.c 2007-06-04 12:28:31.000000000 -0400
|
|
|
|
|
@@ -134,10 +134,6 @@ camel_folder_summary_init (CamelFolderSu
|
|
|
|
|
s->message_info_chunks = NULL;
|
|
|
|
|
s->content_info_chunks = NULL;
|
|
|
|
|
|
|
|
|
@ -205,7 +214,7 @@
|
|
|
|
|
s->version = CAMEL_FOLDER_SUMMARY_VERSION;
|
|
|
|
|
s->flags = 0;
|
|
|
|
|
s->time = 0;
|
|
|
|
|
@@ -873,13 +869,6 @@
|
|
|
|
|
@@ -875,13 +871,6 @@ camel_folder_summary_add(CamelFolderSumm
|
|
|
|
|
|
|
|
|
|
CAMEL_SUMMARY_LOCK(s, summary_lock);
|
|
|
|
|
|
|
|
|
@ -219,9 +228,9 @@
|
|
|
|
|
g_ptr_array_add(s->messages, info);
|
|
|
|
|
g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info);
|
|
|
|
|
s->flags |= CAMEL_SUMMARY_DIRTY;
|
|
|
|
|
--- evolution-data-server-1.11.2/camel/providers/local/camel-maildir-summary.c.kill-ememory 2007-05-09 00:09:30.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.2/camel/providers/local/camel-maildir-summary.c 2007-05-18 10:59:24.000000000 -0400
|
|
|
|
|
@@ -129,10 +129,6 @@
|
|
|
|
|
--- evolution-data-server-1.11.3/camel/providers/local/camel-maildir-summary.c.kill-ememory 2007-05-09 00:09:30.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.3/camel/providers/local/camel-maildir-summary.c 2007-06-04 12:28:31.000000000 -0400
|
|
|
|
|
@@ -129,10 +129,6 @@ camel_maildir_summary_init (CamelMaildir
|
|
|
|
|
s->message_info_size = sizeof(CamelMaildirMessageInfo);
|
|
|
|
|
s->content_info_size = sizeof(CamelMaildirMessageContentInfo);
|
|
|
|
|
|
|
|
|
@ -232,7 +241,7 @@
|
|
|
|
|
if (gethostname(hostname, 256) == 0) {
|
|
|
|
|
o->priv->hostname = g_strdup(hostname);
|
|
|
|
|
} else {
|
|
|
|
|
@@ -329,11 +325,9 @@
|
|
|
|
|
@@ -329,11 +325,9 @@ static CamelMessageInfo *message_info_ne
|
|
|
|
|
|
|
|
|
|
static void message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
|
|
|
|
|
{
|
|
|
|
@ -244,7 +253,7 @@
|
|
|
|
|
((CamelFolderSummaryClass *) parent_class)->message_info_free(s, mi);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -412,7 +406,7 @@
|
|
|
|
|
@@ -412,7 +406,7 @@ static int maildir_summary_load(CamelLoc
|
|
|
|
|
struct dirent *d;
|
|
|
|
|
CamelMaildirSummary *mds = (CamelMaildirSummary *)cls;
|
|
|
|
|
char *uid;
|
|
|
|
@ -253,7 +262,7 @@
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
cur = g_strdup_printf("%s/cur", cls->folder_path);
|
|
|
|
|
@@ -429,7 +423,7 @@
|
|
|
|
|
@@ -429,7 +423,7 @@ static int maildir_summary_load(CamelLoc
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mds->priv->load_map = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
@ -262,7 +271,7 @@
|
|
|
|
|
|
|
|
|
|
while ( (d = readdir(dir)) ) {
|
|
|
|
|
if (d->d_name[0] == '.')
|
|
|
|
|
@@ -438,13 +432,13 @@
|
|
|
|
|
@@ -438,13 +432,13 @@ static int maildir_summary_load(CamelLoc
|
|
|
|
|
/* map the filename -> uid */
|
|
|
|
|
uid = strchr(d->d_name, ':');
|
|
|
|
|
if (uid) {
|
|
|
|
@ -282,7 +291,7 @@
|
|
|
|
|
g_hash_table_insert(mds->priv->load_map, uid, uid);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -455,7 +449,7 @@
|
|
|
|
|
@@ -455,7 +449,7 @@ static int maildir_summary_load(CamelLoc
|
|
|
|
|
|
|
|
|
|
g_hash_table_destroy(mds->priv->load_map);
|
|
|
|
|
mds->priv->load_map = NULL;
|
|
|
|
@ -291,7 +300,7 @@
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
@@ -621,23 +615,8 @@
|
|
|
|
|
@@ -621,23 +615,8 @@ maildir_summary_check(CamelLocalSummary
|
|
|
|
|
filename = camel_maildir_info_filename(mdi);
|
|
|
|
|
/* TODO: only store the extension in the mdi->filename struct, not the whole lot */
|
|
|
|
|
if (filename == NULL || strcmp(filename, d->d_name) != 0) {
|
|
|
|
@ -315,7 +324,7 @@
|
|
|
|
|
}
|
|
|
|
|
camel_message_info_free(info);
|
|
|
|
|
}
|
|
|
|
|
@@ -727,9 +706,6 @@
|
|
|
|
|
@@ -727,9 +706,6 @@ maildir_summary_sync(CamelLocalSummary *
|
|
|
|
|
int count, i;
|
|
|
|
|
CamelMessageInfo *info;
|
|
|
|
|
CamelMaildirMessageInfo *mdi;
|
|
|
|
@ -325,7 +334,7 @@
|
|
|
|
|
char *name;
|
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
|
|
@@ -775,26 +751,8 @@
|
|
|
|
|
@@ -775,26 +751,8 @@ maildir_summary_sync(CamelLocalSummary *
|
|
|
|
|
/* we'll assume it didn't work, but dont change anything else */
|
|
|
|
|
g_free(newname);
|
|
|
|
|
} else {
|
|
|
|
@ -352,8 +361,8 @@
|
|
|
|
|
}
|
|
|
|
|
g_free(name);
|
|
|
|
|
g_free(dest);
|
|
|
|
|
--- evolution-data-server-1.11.2/camel/camel-folder-search.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.2/camel/camel-folder-search.c 2007-05-18 10:59:24.000000000 -0400
|
|
|
|
|
--- evolution-data-server-1.11.3/camel/camel-folder-search.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
|
|
|
|
|
+++ evolution-data-server-1.11.3/camel/camel-folder-search.c 2007-06-04 12:28:31.000000000 -0400
|
|
|
|
|
@@ -53,7 +53,7 @@
|
|
|
|
|
#define r(x)
|
|
|
|
|
|
|
|
|
@ -363,7 +372,7 @@
|
|
|
|
|
CamelException *ex;
|
|
|
|
|
|
|
|
|
|
CamelFolderThread *threads;
|
|
|
|
|
@@ -123,23 +123,23 @@
|
|
|
|
|
@@ -123,23 +123,23 @@ camel_folder_search_init (CamelFolderSea
|
|
|
|
|
|
|
|
|
|
obj->sexp = e_sexp_new();
|
|
|
|
|
|
|
|
|
@ -394,7 +403,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
@@ -154,8 +154,8 @@
|
|
|
|
|
@@ -154,8 +154,8 @@ camel_folder_search_finalize (CamelObjec
|
|
|
|
|
g_hash_table_destroy(search->summary_hash);
|
|
|
|
|
|
|
|
|
|
g_free(search->last_search);
|
|
|
|
@ -405,7 +414,7 @@
|
|
|
|
|
g_free(p);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -345,7 +345,7 @@
|
|
|
|
|
@@ -345,7 +345,7 @@ camel_folder_search_execute_expression(C
|
|
|
|
|
GPtrArray *matches;
|
|
|
|
|
int i;
|
|
|
|
|
GHashTable *results;
|
|
|
|
@ -414,7 +423,7 @@
|
|
|
|
|
struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
|
|
|
|
|
|
|
|
|
|
p->ex = ex;
|
|
|
|
|
@@ -374,11 +374,7 @@
|
|
|
|
|
@@ -374,11 +374,7 @@ camel_folder_search_execute_expression(C
|
|
|
|
|
/* now create a folder summary to return?? */
|
|
|
|
|
if (r->type == ESEXP_RES_ARRAY_PTR) {
|
|
|
|
|
d(printf("got result ...\n"));
|
|
|
|
@ -427,7 +436,7 @@
|
|
|
|
|
if (search->summary) {
|
|
|
|
|
/* reorder result in summary order */
|
|
|
|
|
results = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
|
@@ -390,20 +386,21 @@
|
|
|
|
|
@@ -390,20 +386,21 @@ camel_folder_search_execute_expression(C
|
|
|
|
|
CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
|
|
|
|
|
char *uid = (char *)camel_message_info_uid(info);
|
|
|
|
|
if (g_hash_table_lookup(results, uid)) {
|
|
|
|
@ -455,7 +464,7 @@
|
|
|
|
|
} else {
|
|
|
|
|
g_warning("Search returned an invalid result type");
|
|
|
|
|
}
|
|
|
|
|
@@ -444,7 +441,7 @@
|
|
|
|
|
@@ -444,7 +441,7 @@ camel_folder_search_search(CamelFolderSe
|
|
|
|
|
GPtrArray *matches = NULL, *summary_set;
|
|
|
|
|
int i;
|
|
|
|
|
GHashTable *results;
|
|
|
|
@ -464,7 +473,7 @@
|
|
|
|
|
struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
|
|
|
|
|
|
|
|
|
|
g_assert(search->folder);
|
|
|
|
|
@@ -496,12 +493,7 @@
|
|
|
|
|
@@ -496,12 +493,7 @@ camel_folder_search_search(CamelFolderSe
|
|
|
|
|
/* now create a folder summary to return?? */
|
|
|
|
|
if (r->type == ESEXP_RES_ARRAY_PTR) {
|
|
|
|
|
d(printf("got result ...\n"));
|
|
|
|
@ -478,7 +487,7 @@
|
|
|
|
|
/* reorder result in summary order */
|
|
|
|
|
results = g_hash_table_new(g_str_hash, g_str_equal);
|
|
|
|
|
for (i=0;i<r->value.ptrarray->len;i++) {
|
|
|
|
|
@@ -513,14 +505,15 @@
|
|
|
|
|
@@ -513,14 +505,15 @@ camel_folder_search_search(CamelFolderSe
|
|
|
|
|
CamelMessageInfo *info = g_ptr_array_index(summary_set, i);
|
|
|
|
|
char *uid = (char *)camel_message_info_uid(info);
|
|
|
|
|
if (g_hash_table_lookup(results, uid))
|
|
|
|
@ -499,7 +508,7 @@
|
|
|
|
|
} else {
|
|
|
|
|
g_warning("Search returned an invalid result type");
|
|
|
|
|
}
|
|
|
|
|
@@ -553,12 +546,12 @@
|
|
|
|
|
@@ -553,12 +546,12 @@ void camel_folder_search_free_result(Cam
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
|
|
|
|
|