Changeset 3565
- Timestamp:
- 04/11/08 12:46:36
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r3562 r3565 1 2008-04-11 Philip Van Hoof <pvanhoof@gnome.org> 2 3 * Fixed a bug in case LIST and LSUB are not in agreement 4 ` 1 5 2008-04-10 Philip Van Hoof <pvanhoof@gnome.org> 2 6 trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c
r3564 r3565 448 448 CamelImapStore *imap_store = CAMEL_IMAP_STORE (object); 449 449 450 imap_store->needs_lsub = TRUE; 450 451 imap_store->authtypes = NULL; 451 452 imap_store->got_online = FALSE; … … 3129 3130 manage_subscriptions(store, old_name, TRUE); 3130 3131 goto fail; 3131 } else {3132 } else if (imap_store->needs_lsub) { 3132 3133 CamelImapResponse *response3 = camel_imap_command (imap_store, NULL, ex, "SUBSCRIBE %F", new_name_in); 3133 3134 camel_imap_response_free (imap_store, response3); … … 3603 3604 bah = TRUE; 3604 3605 lst = "%"; 3606 imap_store->needs_lsub = TRUE; 3605 3607 } 3606 3608 … … 3712 3714 3713 3715 response = camel_imap_command (imap_store, NULL, ex, 3714 "%s \"%s\" %s", j==1? "LSUB" : "LIST",3715 prefix, (j!=1 )?lst:"*");3716 "%s \"%s\" %s", (j==1 || j==3) ? "LSUB" : "LIST", 3717 prefix, (j!=1 && j!=3) ? lst : "*"); 3716 3718 3717 3719 if (!response) … … 3727 3729 hfi = g_hash_table_lookup(present, fi->full_name); 3728 3730 if (hfi == NULL) { 3731 if (j == 1 || j == 3) { 3732 fi->flags |= CAMEL_FOLDER_SUBSCRIBED | CAMEL_FOLDER_NONEXISTENT | CAMEL_FOLDER_NOSELECT; 3733 imap_store->needs_lsub = TRUE; 3734 } 3729 3735 g_hash_table_insert(present, fi->full_name, fi); 3730 3736 if (!first) trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.h
r3445 r3565 174 174 gboolean courier_crap, idle_sleep_set; 175 175 gboolean going_online, got_online, clean_exit; 176 gboolean not_recon ;176 gboolean not_recon, needs_lsub; 177 177 178 178 struct addrinfo *addrinfo;
