4 files changed, 79 insertions, 3 deletions

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 1355cedb76..960d6275ca 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -715,6 +715,7 @@ create_folder (CamelStore *store, const char *parent_name,
 
 	fi = get_folder_info (store, full_name, FALSE, FALSE, FALSE, ex);
 	g_free (full_name);
+	
 	return fi;
 }
 
@@ -966,7 +967,7 @@ subscribe_folder (CamelStore *store, const char *folder_name,
 {
 	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
 	CamelImapResponse *response;
-
+	
 	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))
 		return;
 
@@ -975,9 +976,27 @@ subscribe_folder (CamelStore *store, const char *folder_name,
 				       "SUBSCRIBE %S", folder_name);
 	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
 	if (response) {
+		CamelFolderInfo *fi;
+		char *name;
+		
 		g_hash_table_insert (imap_store->subscribed_folders,
 				     g_strdup (folder_name),
 				     GUINT_TO_POINTER (1));
+		
+		name = strrchr (folder_name, imap_store->dir_sep);
+		if (name)
+			name++;
+		
+		fi = g_new0 (CamelFolderInfo, 1);
+		fi->full_name = g_strdup (folder_name);
+		fi->name = g_strdup (name);
+		fi->url = g_strdup_printf ("%s%s", imap_store->base_url, folder_name);
+		fi->unread_message_count = -1;
+		
+		camel_object_trigger_event (CAMEL_OBJECT (store),
+					    "folder_created", fi);
+		
+		camel_folder_info_free (fi);
 	}
 	camel_imap_response_free (response);
 }
@@ -998,11 +1017,29 @@ unsubscribe_folder (CamelStore *store, const char *folder_name,
 				       "UNSUBSCRIBE %S", folder_name);
 	CAMEL_IMAP_STORE_UNLOCK(imap_store, command_lock);
 	if (response) {
+		CamelFolderInfo *fi;
+		char *name;
+		
 		g_hash_table_lookup_extended (imap_store->subscribed_folders,
 					      folder_name, &key, &value);
 		g_hash_table_remove (imap_store->subscribed_folders,
 				     folder_name);
 		g_free (key);
+		
+		name = strrchr (folder_name, imap_store->dir_sep);
+		if (name)
+			name++;
+		
+		fi = g_new0 (CamelFolderInfo, 1);
+		fi->full_name = g_strdup (folder_name);
+		fi->name = g_strdup (name);
+		fi->url = g_strdup_printf ("%s%s", imap_store->base_url, folder_name);
+		fi->unread_message_count = -1;
+		
+		camel_object_trigger_event (CAMEL_OBJECT (store),
+					    "folder_deleted", fi);
+		
+		camel_folder_info_free (fi);
 	}
 	camel_imap_response_free (response);
 }
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 116a10ea7d..ea2894aa2e 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -162,6 +162,7 @@ CamelType camel_local_folder_get_type(void)
 CamelLocalFolder *
 camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)
 {
+	CamelFolderInfo *fi;
 	CamelFolder *folder;
 	const char *root_dir_path, *name;
 	struct stat st;
@@ -213,7 +214,18 @@ camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store, con
 		camel_object_unref (CAMEL_OBJECT (folder));
 		return NULL;
 	}
-
+	
+	fi = g_new0 (CamelFolderInfo, 1);
+	fi->full_name = g_strdup (full_name);
+	fi->name = g_strdup (name);
+	fi->url = g_strdup (lf->folder_path);
+	fi->unread_message_count = -1;
+	
+	camel_object_trigger_event (CAMEL_OBJECT (parent_store),
+				    "folder_deleted", fi);
+	
+	camel_folder_info_free (fi);
+	
 	return lf;
 }
 
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index b6ea31a98f..34da035301 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -270,6 +270,7 @@ rename_folder(CamelStore *store, const char *old, const char *new, CamelExceptio
 static void
 delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 {
+	CamelFolderInfo *fi;
 	char *name;
 	char *str;
 
@@ -281,6 +282,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 				     _("Could not delete folder summary file `%s': %s"),
 				     str, strerror(errno));
 		g_free(str);
+		g_free (name);
 		return;
 	}
 	g_free(str);
@@ -290,8 +292,20 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 				     _("Could not delete folder index file `%s': %s"),
 				     str, strerror(errno));
 		g_free(str);
+		g_free (name);
 		return;
 	}
 	g_free(str);
 	g_free(name);
+	
+	fi = g_new0 (CamelFolderInfo, 1);
+	fi->full_name = g_strdup (folder_name);
+	fi->name = g_strdup (g_basename (folder_name));
+	fi->url = g_strdup_printf ("%s%s", CAMEL_SERVICE(store)->url->path, folder_name);
+	fi->unread_message_count = -1;
+	
+	camel_object_trigger_event (CAMEL_OBJECT (store),
+				    "folder_deleted", fi);
+	
+	camel_folder_info_free (fi);
 }
diff --git a/camel/providers/vee/camel-vee-folder.c b/camel/providers/vee/camel-vee-folder.c
index 4f3616ec12..057d227a61 100644
--- a/camel/providers/vee/camel-vee-folder.c
+++ b/camel/providers/vee/camel-vee-folder.c
@@ -22,6 +22,7 @@
 
 #include "camel-exception.h"
 #include "camel-vee-folder.h"
+#include "camel-store.h"
 #include "camel-folder-summary.h"
 #include "camel-mime-message.h"
 #ifdef DYNAMIC
@@ -172,6 +173,7 @@ camel_vee_folder_finalise (CamelObject *obj)
 CamelFolder *
 camel_vee_folder_new (CamelStore *parent_store, const char *name, CamelException *ex)
 {
+	CamelFolderInfo *fi;
 	CamelFolder *folder;
 	CamelVeeFolder *vf;
 	char *namepart, *searchpart;
@@ -201,7 +203,18 @@ camel_vee_folder_new (CamelStore *parent_store, const char *name, CamelException
 		camel_object_unref (CAMEL_OBJECT (folder));
 		return NULL;
 	}
-
+	
+	fi = g_new0 (CamelFolderInfo, 1);
+	fi->full_name = g_strdup (name);
+	fi->name = g_strdup (name);
+	fi->url = g_strdup_printf ("vfolder:%s?%s", vf->vname, vf->expression);
+	fi->unread_message_count = -1;
+	
+	camel_object_trigger_event (CAMEL_OBJECT (parent_store),
+				    "folder_created", fi);
+	
+	camel_folder_info_free (fi);
+	
 	return folder;
 }