From f37b0a1ab7d9dd437905d10d85410992ad9abc0a Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 17 Dec 2002 20:38:25 +0000 Subject: ...And a whole bunch more build fixes. 2002-12-17 Jeffrey Stedfast ...And a whole bunch more build fixes. * mail-vfolder.c (mail_vfolder_delete_uri): Don't use g_string_sprintfa() anymore since it is apparently deprecated. * mail-session.c (main_get_filter_driver): Don't use g_string_sprintfa() anymore since it is apparently deprecated. * mail-ops.c (build_from): Don't use g_string_sprintfa() anymore since it is apparently deprecated. * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Don't use g_string_sprintfa() anymore since it is apparently deprecated. * mail-autofilter.c: Don't use g_string_sprintfa() anymore since it is apparently deprecated. * folder-browser.c: Don't use g_string_sprintfa() anymore since it is apparently deprecated. * mail-search.c (mail_search_set_subject): Remove the unnecessary g_strdup()'age as well as fix a possible buffer overrun. * mail-local.c (mail_local_folder_construct): Use g_path_get_basename(). * mail-config-druid.c (make_account): Don't use e_utf8_* functions. svn path=/trunk/; revision=19152 --- mail/mail-local.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'mail/mail-local.c') diff --git a/mail/mail-local.c b/mail/mail-local.c index c8d80c8a5e..490514be9d 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -627,23 +627,21 @@ mail_local_folder_get_type (void) } static MailLocalFolder * -mail_local_folder_construct(MailLocalFolder *mlf, MailLocalStore *parent_store, const char *full_name, CamelException *ex) +mail_local_folder_construct(MailLocalFolder *mlf, MailLocalStore *parent_store, const char *full_name, CamelException *ex) { - const char *name; - char *metapath; + char *metapath, *name; - name = g_basename (full_name); + name = g_path_get_basename (full_name); + d(printf ("constructing local folder: full = %s, name = %s\n", full_name, name)); + camel_folder_construct (CAMEL_FOLDER (mlf), CAMEL_STORE (parent_store), full_name, name); + g_free (name); + + mlf->real_path = g_strdup (((CamelFolder *) mlf)->full_name); + + metapath = g_strdup_printf ("%s/%s/local-metadata.xml", ((CamelService *) parent_store)->url->path, full_name); + mlf->meta = load_metainfo (metapath); + g_free (metapath); - d(printf("constructing local folder: full = %s, name = %s\n", full_name, name)); - - camel_folder_construct(CAMEL_FOLDER (mlf), CAMEL_STORE(parent_store), full_name, name); - - mlf->real_path = g_strdup(((CamelFolder *)mlf)->full_name); - - metapath = g_strdup_printf("%s/%s/local-metadata.xml", ((CamelService *)parent_store)->url->path, full_name); - mlf->meta = load_metainfo(metapath); - g_free(metapath); - return mlf; } -- cgit v1.2.3