diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 4 | ||||
| -rw-r--r-- | mail/mail-config-druid.c | 3 | ||||
| -rw-r--r-- | mail/subscribe-dialog.c | 17 |
4 files changed, 19 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 9e278e472e..bd0be303da 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-09-10 Jeffrey Stedfast <fejj@ximian.com> + + * mail-callbacks.c (mail_generate_reply): Don't use + new_with_sig_file, that function no longer exists. + (forward_get_composer): Same here. + 2001-09-10 Zbigniew Chyla <cyba@gnome.pl> * mail-config.c diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 20dc903ba4..b6437d565e 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -763,7 +763,7 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char EMsgComposer *composer; time_t date; - composer = e_msg_composer_new_with_sig_file (); + composer = e_msg_composer_new (); if (!composer) return NULL; @@ -1029,7 +1029,7 @@ forward_get_composer (CamelMimeMessage *message, const char *subject) if (!account) account = mail_config_get_default_account (); - composer = e_msg_composer_new_with_sig_file (); + composer = e_msg_composer_new (); if (composer) { gtk_signal_connect (GTK_OBJECT (composer), "send", GTK_SIGNAL_FUNC (composer_send_cb), NULL); diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index 043964443b..13b5919224 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -884,7 +884,8 @@ evolution_mail_config_wizard_factory_fn (BonoboGenericFactory *factory, account_wizard = wizard; gtk_object_set_data_full (GTK_OBJECT (account_wizard), - "account-data", gui, wizard_free); + "account-data", gui, + (GtkDestroyNotify) wizard_free); gui->wizard = wizard; gtk_signal_connect (GTK_OBJECT (wizard), "next", diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c index 1c498ed104..3d0aec4791 100644 --- a/mail/subscribe-dialog.c +++ b/mail/subscribe-dialog.c @@ -148,18 +148,19 @@ recursive_add_folder (EvolutionStorage *storage, const char *path, const char *n typedef void (*SubscribeShortFolderinfoFunc) (CamelStore *store, gchar *prefix, CamelFolderInfo *info, gpointer data); -int subscribe_get_short_folderinfo (CamelStore *store, gchar *prefix, SubscribeShortFolderinfoFunc func, gpointer user_data); +int subscribe_get_short_folderinfo (CamelStore *store, const char *prefix, + SubscribeShortFolderinfoFunc func, gpointer user_data); struct _get_short_folderinfo_msg { - struct _mail_msg msg; + struct _mail_msg msg; - gchar *prefix; + char *prefix; - CamelStore *store; - CamelFolderInfo *info; + CamelStore *store; + CamelFolderInfo *info; - SubscribeShortFolderinfoFunc func; - gpointer user_data; + SubscribeShortFolderinfoFunc func; + gpointer user_data; }; static char * @@ -225,7 +226,7 @@ static struct _mail_msg_op get_short_folderinfo_op = { int subscribe_get_short_folderinfo (CamelStore *store, - gchar *prefix, + const char *prefix, SubscribeShortFolderinfoFunc func, gpointer user_data) { |