diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-09-11 23:11:04 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2008-09-11 23:11:04 +0800 |
| commit | 6001e82295b6e218b1cb9b8cf1a950cf61b01919 (patch) | |
| tree | 35bb183485c392beeb44b2dfa0b4035da0907f8f /mail/mail-vfolder.c | |
| parent | 444ae074342cd58cc68d97566bc3aacfb85b30b8 (diff) | |
| download | gsoc2013-evolution-6001e82295b6e218b1cb9b8cf1a950cf61b01919.tar gsoc2013-evolution-6001e82295b6e218b1cb9b8cf1a950cf61b01919.tar.gz gsoc2013-evolution-6001e82295b6e218b1cb9b8cf1a950cf61b01919.tar.bz2 gsoc2013-evolution-6001e82295b6e218b1cb9b8cf1a950cf61b01919.tar.lz gsoc2013-evolution-6001e82295b6e218b1cb9b8cf1a950cf61b01919.tar.xz gsoc2013-evolution-6001e82295b6e218b1cb9b8cf1a950cf61b01919.tar.zst gsoc2013-evolution-6001e82295b6e218b1cb9b8cf1a950cf61b01919.zip | |
** Fix for bug #534039
2008-09-11 Milan Crha <mcrha@redhat.com>
** Fix for bug #534039
* mail-vfolder.c: (vfolder_load_storage): Load store to mail component
first, to have all notifications registered in time of adding rules.
* mail-folder-cache.c: (real_flush_updates): Dropped unnecessary and
offending code causing infinite loops when deleting search folder.
svn path=/trunk/; revision=36304
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index d0d9997203..951bcc51e7 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -956,6 +956,9 @@ vfolder_load_storage(void) g_signal_connect(context, "rule_added", G_CALLBACK(context_rule_added), context); g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context); + /* load store to mail component */ + mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders")); + /* and setup the rules we have */ rule = NULL; while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) { @@ -966,9 +969,6 @@ vfolder_load_storage(void) d(printf("invalid rule (%p) encountered: rule->name is NULL\n", rule)); } - /* load store to mail component at the end, when everything is loaded */ - mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders")); - g_free(storeuri); /* reenable the feature if required */ |