diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-utils.c | 30 | ||||
| -rw-r--r-- | mail/mail-vfolder.c | 3 |
3 files changed, 23 insertions, 17 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 2c2b692ff5..8d65314210 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,12 @@ 2004-01-16 Jeffrey Stedfast <fejj@ximian.com> + * mail-vfolder.c (mail_vfolder_rename_uri): s/g_fre/g_free/ + + * em-utils.c (guess_account): Change 'tmp' to not be const - fixes + a compile warning. + (em_utils_expunge_folder): Cast parent to a GtkWindow. + (em_utils_empty_trash): Same. + * em-migrate.c (cp): Oops, still need to stat() the src file so we can report what percentage of the file has been completed so far and also so we don't quit copying until we've copied the whole diff --git a/mail/em-utils.c b/mail/em-utils.c index 3740e47271..016d99380a 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -915,10 +915,10 @@ guess_account (CamelMimeMessage *message, CamelFolder *folder) const CamelInternetAddress *to, *cc; GHashTable *account_hash = NULL; EAccount *account = NULL; - const char *addr; + const char *posthdr, *addr; + char *tmp; int i; - const char *posthdr, *tmp; - + /* check for newsgroup header */ posthdr = camel_medium_get_header (CAMEL_MEDIUM (message), "Newsgroups"); @@ -2400,12 +2400,12 @@ em_utils_expunge_folder (GtkWidget *parent, CamelFolder *folder) camel_object_get(folder, NULL, CAMEL_OBJECT_DESCRIPTION, &name, 0); - if (!em_utils_prompt_user(parent, GTK_RESPONSE_NO, - "/apps/evolution/mail/prompts/expunge", - _("This operation will permanently remove all deleted messages " - "in the folder `%s'. If you continue, you " - "will not be able to recover these messages.\n" - "\nReally erase these messages?"), name)) + if (!em_utils_prompt_user ((GtkWindow *) parent, GTK_RESPONSE_NO, + "/apps/evolution/mail/prompts/expunge", + _("This operation will permanently remove all deleted messages " + "in the folder `%s'. If you continue, you " + "will not be able to recover these messages.\n" + "\nReally erase these messages?"), name)) return; mail_expunge_folder(folder, NULL, NULL); @@ -2426,12 +2426,12 @@ em_utils_empty_trash (GtkWidget *parent) EAccount *account; EIterator *iter; CamelException ex; - - if (!em_utils_prompt_user(parent, GTK_RESPONSE_NO, "/apps/evolution/mail/prompts/empty_trash", - _("This operation will permanently remove all deleted messages " - "in all folders. If you continue, you will not be able to " - "recover these messages.\n" - "\nReally erase these messages?"))) + + if (!em_utils_prompt_user ((GtkWindow *) parent, GTK_RESPONSE_NO, "/apps/evolution/mail/prompts/empty_trash", + _("This operation will permanently remove all deleted messages " + "in all folders. If you continue, you will not be able to " + "recover these messages.\n" + "\nReally erase these messages?"))) return; camel_exception_init (&ex); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 963006c915..80501b32b0 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -554,7 +554,7 @@ mail_vfolder_rename_uri(CamelStore *store, const char *cfrom, const char *cto) } g_free(from); - g_fre(to); + g_free(to); } /* ********************************************************************** */ @@ -746,7 +746,6 @@ store_folder_deleted(CamelObject *o, void *event_data, void *data) static void store_folder_renamed(CamelObject *o, void *event_data, void *data) { - CamelStore *store = (CamelStore *)o; CamelRenameInfo *info = event_data; FilterRule *rule; char *user; |