General cleanup of mail debug printfs.

2001-09-19    <NotZed@Ximian.com>

        * General cleanup of mail debug printfs.

        * mail-folder-cache.[ch]: Completely rewritten.  Removed all calls
        to the old code everywhere they were used.  Nuff said.

        * folder-browser.h: Add shell_view to folder_browser & api to set
        it.

        * folder-browser-factory.c (control_activate): Set the shell-view
        on the folder_browser.
        (control_deactivate): And clear it here.

        * folder-browser.c (folder_browser_destroy): Unhook from changed
        events on the folder before giving it away.
        (got_folder): Hook onto the folder-changed events.
        (folder_changed): Event hook proxy for folder_changed events
        (main_folder_changed): And the main code version.
        (update_status_bar): And the one that actually does the work.
        (on_selection_changed): Also call update_status_bar() to update
        the selection count.
        (folder_browser_set_shell_view): Implement function to set the
        shell_view on the folder_browser.
        (folder_browser_destroy): Release the shell_view here too.

        * mail-tools.c (mail_tool_uri_to_folder): Dont 'note' the new
        folder if its from a file: url, this is handled by hte local store
        (yeeruughck).

        * mail-local.c (mls_init):
        (free_info):
        (mls_finalise): Setup init/finalise funcs for the folderinfo hash.
        (local_storage_removed_folder_cb): re-enable.

2001-09-18    <NotZed@Ximian.com>

        * mail-local.c (MailLocalStore): Add a hash table to store
        uri<>folderinfo data.
        (mail_local_store_add_folder): Add a new folderinfo to our hash.
        (mail_local_store_remove_folder): Remove a folder by uri.
        (storage_listener_startup): Add this store to those monitored by
        the folder tree.

svn path=/trunk/; revision=12974

1 files changed, 6 insertions, 10 deletions

diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 1c151b9d5e..09603eb458 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -323,12 +323,6 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
 	
 	g_return_val_if_fail (uri != NULL, NULL);
 	
-	folder = mail_folder_cache_try_folder (uri);
-	if (folder) {
-		camel_object_ref (CAMEL_OBJECT (folder));
-		return folder;
-	}
-	
 	/* This hack is still needed for file:/ since it's its own EvolutionStorage type */
 	if (!strncmp (uri, "vtrash:", 7))
 		offset = 7;
@@ -353,8 +347,6 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
 				name = "";
 		}
 		
-		printf("opening folder '%s' on store (%p) '%s'\n", name, store, uri);
-		
 		if (offset)
 			folder = camel_store_get_trash (store, ex);
 		else
@@ -368,8 +360,12 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
 			camel_object_unref (CAMEL_OBJECT (folder));
 			folder = NULL;
 		}
-	} else
-		mail_folder_cache_note_folder (uri, folder);
+	} else {
+		/* we dont want to note file url's, they need to be noted elsewhere (sigh) */
+		if (strncmp(uri, "file:", 5) != 0)
+			mail_note_folder(folder, NULL);
+		/*mail_folder_cache_note_folder (uri, folder);*/
+	}
 	
 	camel_url_free (url);