diff options
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-folder.c | 25 |
2 files changed, 26 insertions, 6 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 2e891859c7..e3add679f8 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,12 @@ 2002-08-09 Peter Williams <peterw@ximian.com> + * providers/imap/camel-imap-folder.c (get_temp_uid): New function, + generate a UID that has better chances of being unique. + (imap_append_offline): Use it here. + (imap_transfer_offline): And here. + +2002-08-09 Peter Williams <peterw@ximian.com> + * providers/imap/camel-imap-store.c (get_folder_info_online): Tweak how we build the tree based on whether a full tree or a subtree is being requested. Fixes subscribe dialog diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 5f1cab5293..020e0e3edd 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -1052,6 +1052,23 @@ imap_expunge_uids_resyncing (CamelFolder *folder, GPtrArray *uids, CamelExceptio CAMEL_IMAP_STORE_UNLOCK (store, command_lock); } +static gchar * +get_temp_uid (void) +{ + gchar *res; + + static int counter = 0; + G_LOCK_DEFINE_STATIC (lock); + + G_LOCK (lock); + res = g_strdup_printf ("tempuid-%lx-%d", + (unsigned long) time (NULL), + counter++); + G_UNLOCK (lock); + + return res; +} + static void imap_append_offline (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, @@ -1062,10 +1079,7 @@ imap_append_offline (CamelFolder *folder, CamelMimeMessage *message, CamelFolderChangeInfo *changes; char *uid; - /* We could keep a separate counter, but this one works fine. */ - CAMEL_IMAP_STORE_LOCK (imap_store, command_lock); - uid = g_strdup_printf ("append-%d", imap_store->command++); - CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock); + uid = get_temp_uid (); camel_imap_summary_add_offline (folder->summary, uid, message, info); CAMEL_IMAP_FOLDER_LOCK (folder, cache_lock); @@ -1273,8 +1287,7 @@ imap_transfer_offline (CamelFolder *source, GPtrArray *uids, for (i = 0; i < uids->len; i++) { uid = uids->pdata[i]; - destuid = g_strdup_printf ("copy-%s:%s:%d", source->full_name, uid, - store->command++); + destuid = get_temp_uid (); mi = camel_folder_summary_uid (source->summary, uid); g_return_if_fail (mi != NULL); |