diff options
| -rw-r--r-- | camel/providers/imap/camel-imap-folder.c | 13 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-search.c | 7 |
2 files changed, 6 insertions, 14 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 952e28faa7..3f9149d627 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -89,14 +89,6 @@ static void imap_update_summary (CamelFolder *folder, int first, int last, static GPtrArray *imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex); static void imap_search_free (CamelFolder *folder, GPtrArray *uids); -/* flag methods */ -static guint32 imap_get_message_flags (CamelFolder *folder, const char *uid); -static void imap_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set); -static gboolean imap_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name); -static void imap_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, - gboolean value); - - static void camel_imap_folder_class_init (CamelImapFolderClass *camel_imap_folder_class) { @@ -303,7 +295,6 @@ imap_refresh_info (CamelFolder *folder, CamelException *ex) camel_folder_change_info_remove_uid (changes, camel_message_info_uid (info)); camel_folder_summary_remove (imap_folder->summary, info); camel_folder_summary_info_free(folder->summary, info); - folder_changed = TRUE; g_free (new[i].uid); i--; summary_len--; @@ -705,11 +696,13 @@ imap_search_by_expression (CamelFolder *folder, const char *expression, CamelExc camel_folder_search_set_folder (imap_folder->search, folder); summary = camel_folder_get_summary(folder); camel_folder_search_set_summary(imap_folder->search, summary); - uids = camel_folder_search_execute_expression (imap_folder->search, expression, ex); + matches = camel_folder_search_execute_expression (imap_folder->search, expression, ex); CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock); camel_folder_free_summary(folder, summary); + + return matches; } static void diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c index cec0ee1f89..09c21a5c47 100644 --- a/camel/providers/imap/camel-imap-search.c +++ b/camel/providers/imap/camel-imap-search.c @@ -70,11 +70,10 @@ imap_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s) { CamelImapStore *store = CAMEL_IMAP_STORE (s->folder->parent_store); - CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (s->folder); char *value = argv[0]->value.string; CamelImapResponse *response; char *result, *p, *lasts = NULL, *real_uid; - const char *uid; + const char *uid = ""; ESExpResult *r; CamelMessageInfo *info; GHashTable *uid_hash = NULL; @@ -121,10 +120,10 @@ imap_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, uid_hash = g_hash_table_new(g_str_hash, g_str_equal); for (i=0;i<s->summary->len;i++) { info = s->summary->pdata[i]; - g_hash_table_insert(uid_hash, camel_message_info_uid(info), info); + g_hash_table_insert(uid_hash, (char *)camel_message_info_uid(info), info); } } - if (g_hash_table_lookup_extended(uid_hash, p, &real_uid, &info)) + if (g_hash_table_lookup_extended(uid_hash, p, (void *)&real_uid, (void *)&info)) g_ptr_array_add (r->value.ptrarray, real_uid); } } |