aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-folder-cache.c5
-rw-r--r--mail/mail-tools.c5
3 files changed, 11 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4c866ed8b3..1aaad2de7a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2004-05-22 Not Zed <NotZed@Ximian.com>
+ * mail-tools.c (mail_tool_uri_to_folder): put note_store back in.
+ Quick hack to fix the issue of folders being opened before we hook
+ onto folder_created.
+
+ * mail-folder-cache.c: remove 'name' from update struct, not used
+ anymore
+
** Another unread count bug, #58814.
* mail-vfolder.c (context_rule_added):
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index eb8b016d81..4f2e3b20d2 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -87,7 +87,6 @@ struct _folder_update {
unsigned int new:1; /* new mail arrived? */
char *path;
- char *name;
char *uri;
char *oldpath;
char *olduri;
@@ -136,7 +135,6 @@ static void
free_update(struct _folder_update *up)
{
g_free(up->path);
- g_free(up->name);
g_free(up->uri);
if (up->store)
camel_object_unref(up->store);
@@ -377,7 +375,6 @@ setup_folder(CamelFolderInfo *fi, struct _store_info *si)
if (mfi) {
update_1folder(mfi, 0, fi);
} else {
- /* always 'add it', but only 'add it' to non-local stores */
/*d(printf("Adding new folder: %s (%s) %d unread\n", fi->path, fi->url, fi->unread_message_count));*/
mfi = g_malloc0(sizeof(*mfi));
mfi->path = g_strdup(fi->path);
@@ -391,7 +388,6 @@ setup_folder(CamelFolderInfo *fi, struct _store_info *si)
up = g_malloc0(sizeof(*up));
up->path = g_strdup(mfi->path);
- up->name = g_strdup(fi->name);
up->uri = g_strdup(fi->uri);
up->unread = (fi->unread==-1)?0:fi->unread;
up->store = si->store;
@@ -616,7 +612,6 @@ rename_folders(struct _store_info *si, const char *oldbase, const char *newbase,
g_free(old);
up->path = g_strdup(mfi->path);
- up->name = g_strdup(fi->name);
up->uri = g_strdup(mfi->uri);
up->unread = fi->unread==-1?0:fi->unread;
up->store = si->store;
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 7050cfdba3..5a6f13d5a4 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -38,7 +38,6 @@
#include <gconf/gconf-client.h>
#include <camel/camel-vee-folder.h>
-#include <camel/camel-store.h>
#include <camel/camel-file-utils.h>
#include <camel/camel-movemail.h>
@@ -53,6 +52,7 @@
#include "mail-vfolder.h"
#include "mail-tools.h"
#include "mail-mt.h"
+#include "mail-folder-cache.h"
#include "em-utils.h"
/* **************************************** */
@@ -355,6 +355,9 @@ mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex)
camel_object_unref (store);
}
+ if (folder)
+ mail_note_folder (folder);
+
camel_url_free (url);
g_free(curi);