Changeset 3258
- Timestamp:
- 01/14/08 23:21:50
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.h (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (2 diffs)
- trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c (modified) (2 diffs)
- trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-summary.c (modified) (3 diffs)
- trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-mbox-summary.c (modified) (3 diffs)
- trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-mh-summary.c (modified) (1 diff)
- trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
- trunk/libtinymail/tny-folder-store-query.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r3249 r3258 7 7 CamelOperation holds one more significant memory leak at its 8 8 status_hack linked list. That one is not yet fixed. 9 * Flag setting to 0xffff must be 0x1fff as bit 13 and 14 are system 10 bits that should not be altered like that. 9 11 10 12 2008-01-13 Philip Van Hoof <pvanhoof@gnome.org> trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.h
r3216 r3258 90 90 91 91 /* Changes to system flags will NOT trigger a folder changed event */ 92 #define CAMEL_MESSAGE_SYSTEM_MASK (0x ffff << 12)92 #define CAMEL_MESSAGE_SYSTEM_MASK (0x1fff << 12) 93 93 94 94 typedef struct _CamelFlag { trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c
r3249 r3258 442 442 CamelImapStore *imap_store = CAMEL_IMAP_STORE (object); 443 443 444 imap_store->authtypes = NULL; 444 445 imap_store->got_online = FALSE; 445 446 imap_store->going_online = FALSE; … … 785 786 /* We assume we have utf8 capable search until a failed search tells us otherwise */ 786 787 store->capabilities = IMAP_CAPABILITY_utf8_search; 788 789 if (store->authtypes) { 790 g_hash_table_foreach_remove (store->authtypes, 791 free_key, NULL); 792 g_hash_table_destroy (store->authtypes); 793 store->authtypes = NULL; 794 } 795 787 796 store->authtypes = g_hash_table_new (g_str_hash, g_str_equal); 788 797 response = camel_imap_command (store, NULL, ex, "CAPABILITY"); trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c
r3217 r3258 458 458 #endif 459 459 mi->info.flags = camel_message_info_flags(info); 460 /*mi->info.flags |= (camel_message_info_flags(info) & 0x ffff);*/460 /*mi->info.flags |= (camel_message_info_flags(info) & 0x1fff);*/ 461 461 mi->info.size = ((CamelMessageInfoBase*)info)->size; 462 462 } … … 506 506 p++; 507 507 if (*p == 0 && sscanf (uidstr, "%u", &uid) == 1) { 508 g_string_printf (out, "%08x-%04x", uid, mi->info.flags & 0x ffff);508 g_string_printf (out, "%08x-%04x", uid, mi->info.flags & 0x1fff); 509 509 } else { 510 g_string_printf (out, "%s-%04x", uidstr, mi->info.flags & 0x ffff);510 g_string_printf (out, "%s-%04x", uidstr, mi->info.flags & 0x1fff); 511 511 } 512 512 trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-summary.c
r3242 r3258 317 317 #endif 318 318 mi->info.flags = camel_message_info_flags(info); 319 /*mi->info.flags |= (camel_message_info_flags(info) & 0x ffff);*/319 /*mi->info.flags |= (camel_message_info_flags(info) & 0x1fff);*/ 320 320 mi->info.size = ((CamelMessageInfoBase*)info)->size; 321 321 } … … 808 808 809 809 /* have our flags/ i.e. name changed? */ 810 if ( strcmp(newname, camel_maildir_info_filename (mdi))) {810 if (newname && strcmp(newname, camel_maildir_info_filename (mdi))) { 811 811 name = g_strdup_printf("%s/cur/%s", cls->folder_path, camel_maildir_info_filename(mdi)); 812 812 dest = g_strdup_printf("%s/cur/%s", cls->folder_path, newname); … … 815 815 /* we'll assume it didn't work, but dont change anything else */ 816 816 g_free(newname); 817 newname = NULL; 817 818 } 818 819 g_free(name); 819 820 g_free(dest); 820 } else { 821 } 822 823 if (newname) 821 824 g_free(newname); 822 }823 825 824 826 /* strip FOLDER_MESSAGE_FLAGED, etc */ 825 mdi->info.info.flags &= 0x ffff;827 mdi->info.info.flags &= 0x1fff; 826 828 } 827 829 camel_message_info_free(info); trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-mbox-summary.c
r3216 r3258 234 234 235 235 if (*p == 0 && sscanf(uidstr, "%u", &uid) == 1) { 236 return g_strdup_printf("%08x-%04x", uid, mi->info.flags & 0x ffff);236 return g_strdup_printf("%08x-%04x", uid, mi->info.flags & 0x1fff); 237 237 } else { 238 return g_strdup_printf("%s-%04x", uidstr, mi->info.flags & 0x ffff);238 return g_strdup_printf("%s-%04x", uidstr, mi->info.flags & 0x1fff); 239 239 } 240 240 } … … 814 814 camel_mime_parser_drop_step(mp); 815 815 816 info->info.info.flags &= 0x ffff;816 info->info.info.flags &= 0x1fff; 817 817 camel_message_info_free((CamelMessageInfo *)info); 818 818 } … … 1032 1032 goto error; 1033 1033 } 1034 info->info.info.flags &= 0x ffff;1034 info->info.info.flags &= 0x1fff; 1035 1035 g_free(xevnew); 1036 1036 xevnew = NULL; trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-mh-summary.c
r3216 r3258 337 337 g_free(name); 338 338 } else if (info->info.flags & (CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED)) { 339 info->info.flags &= 0x ffff;339 info->info.flags &= 0x1fff; 340 340 } 341 341 camel_message_info_free(info); trunk/libtinymail-camel/tny-camel-folder.c
r3235 r3258 2907 2907 { 2908 2908 TnyFolder *cur = TNY_FOLDER (tny_iterator_get_current (iter)); 2909 recurse_evt (cur, TNY_FOLDER_STORE (folder), list, func, rem);2909 list = recurse_evt (cur, TNY_FOLDER_STORE (folder), list, func, rem); 2910 2910 g_object_unref (cur); 2911 2911 tny_iterator_next (iter); … … 4603 4603 4604 4604 if (!info || camel_exception_is_set (&ex) || !priv->account) { 4605 if (camel_exception_is_set (&ex)) 4605 if (camel_exception_is_set (&ex)) { 4606 4606 g_set_error (err, TNY_FOLDER_STORE_ERROR, 4607 4607 TNY_FOLDER_STORE_ERROR_CREATE_FOLDER, 4608 4608 camel_exception_get_description (&ex)); 4609 else 4609 camel_exception_clear (&ex); 4610 } else 4610 4611 g_set_error (err, TNY_FOLDER_STORE_ERROR, 4611 4612 TNY_FOLDER_STORE_ERROR_CREATE_FOLDER, trunk/libtinymail/tny-folder-store-query.c
r3161 r3258 76 76 { 77 77 TnyFolderStoreQuery *self = (TnyFolderStoreQuery*) object; 78 g_object_unref ( G_OBJECT (self->items));78 g_object_unref (self->items); 79 79 parent_class->finalize (object); 80 80 return;
