From df8180e04abf2efd32ca0624484df5b35e564759 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Mon, 13 Aug 2001 21:36:41 +0000 Subject: Fix this so it can actually get folders from the hash of folders on the 2001-08-13 Jason Leach * mail-local.c (get_folder): Fix this so it can actually get folders from the hash of folders on the local store (it was looking up plain @folder_name, which is typically "mbox", instead of the full URI, /home/jleach/evolution/local/Foo/mbox). * component-factory.c (do_remove_folder): Rename to remove_folder_done, more fitting for it's purpose. (do_xfer_folder): Similar name change. (do_create_folder): Similar name change. (remove_folder): Don't notifyResult for the component here, we will notify with our result in remove_folder_done. (xfer_folder): Ditto. * mail-vfolder.c (vfolder_refresh): Create new folders with unread counts of "0" instead of #FALSE (which just happens to be #defined as zero). svn path=/trunk/; revision=11964 --- mail/component-factory.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index 0fd451be5f..c11706e628 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -171,7 +171,7 @@ create_view (EvolutionShellComponent *shell_component, } static void -do_create_folder (char *uri, CamelFolder *folder, void *data) +create_folder_done (char *uri, CamelFolder *folder, void *data) { GNOME_Evolution_ShellComponentListener listener = data; CORBA_Environment ev; @@ -204,7 +204,7 @@ create_folder (EvolutionShellComponent *shell_component, looks silly but turns into a CamelURL that has url->provider of "mbox" */ uri = g_strdup_printf ("mbox://%s", physical_uri); - mail_create_folder (uri, do_create_folder, CORBA_Object_duplicate (listener, &ev)); + mail_create_folder (uri, create_folder_done, CORBA_Object_duplicate (listener, &ev)); } else { GNOME_Evolution_ShellComponentListener_notifyResult ( listener, GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE, &ev); @@ -213,7 +213,7 @@ create_folder (EvolutionShellComponent *shell_component, } static void -do_remove_folder (char *uri, gboolean removed, void *data) +remove_folder_done (char *uri, gboolean removed, void *data) { GNOME_Evolution_ShellComponentListener listener = data; GNOME_Evolution_ShellComponentListener_Result result; @@ -248,15 +248,12 @@ remove_folder (EvolutionShellComponent *shell_component, return; } - mail_remove_folder (physical_uri, do_remove_folder, CORBA_Object_duplicate (listener, &ev)); - GNOME_Evolution_ShellComponentListener_notifyResult (listener, - GNOME_Evolution_ShellComponentListener_OK, &ev); - + mail_remove_folder (physical_uri, remove_folder_done, CORBA_Object_duplicate (listener, &ev)); CORBA_exception_free (&ev); } static void -do_xfer_folder (gboolean ok, void *data) +xfer_folder_done (gboolean ok, void *data) { GNOME_Evolution_ShellComponentListener listener = data; GNOME_Evolution_ShellComponentListener_Result result; @@ -315,11 +312,8 @@ xfer_folder (EvolutionShellComponent *shell_component, if (source) { uids = camel_folder_get_uids (source); mail_transfer_messages (source, uids, remove_source, destination_physical_uri, - do_xfer_folder, + xfer_folder_done, CORBA_Object_duplicate (listener, &ev)); - - GNOME_Evolution_ShellComponentListener_notifyResult (listener, GNOME_Evolution_ShellComponentListener_OK, - &ev); } else GNOME_Evolution_ShellComponentListener_notifyResult (listener, GNOME_Evolution_ShellComponentListener_INVALID_URI, &ev); CORBA_exception_free (&ev); -- cgit v1.2.3