From 550e7d56134477b113cd5af220a0c8851fad5097 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 28 Jun 2001 20:19:41 +0000 Subject: The e_iterator_get() returns a gconstpointer and we need a non-const 2001-06-28 Jeffrey Stedfast * mail-send-recv.c (free_send_data): The e_iterator_get() returns a gconstpointer and we need a non-const BonoboControl so cast it. * mail-account-gui.c (mail_account_gui_new): gui->check_html_signature is GtkToggleButton not a GtkCheckButton. * folder-info.c: Added some #include's to supress warnings. svn path=/trunk/; revision=10574 --- mail/ChangeLog | 10 ++++++++++ mail/folder-info.c | 6 ++++++ mail/mail-account-gui.c | 2 +- mail/mail-send-recv.c | 6 ++++-- mail/mail.h | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 6ce834d78a..3e8d0a0708 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2001-06-28 Jeffrey Stedfast + + * mail-send-recv.c (free_send_data): The e_iterator_get() returns + a gconstpointer and we need a non-const BonoboControl so cast it. + + * mail-account-gui.c (mail_account_gui_new): + gui->check_html_signature is GtkToggleButton not a GtkCheckButton. + + * folder-info.c: Added some #include's to supress warnings. + 2001-06-28 Ettore Perazzoli * mail-display.c: Fix case of labels in the `link_menu' so that it diff --git a/mail/folder-info.c b/mail/folder-info.c index e5b84b60cb..ab823cadb3 100644 --- a/mail/folder-info.c +++ b/mail/folder-info.c @@ -16,7 +16,11 @@ #include #include +#include "mail.h" #include "mail-mt.h" +#include "mail-tools.h" + +#include #include #define FOLDER_INFO_IID "OAFIID:GNOME_Evolution_FolderInfo_Factory" @@ -48,6 +52,8 @@ struct _folder_info_msg { int unread; }; +static GtkType evolution_folder_info_get_type (void); + static void do_get_info (struct _mail_msg *mm) { diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 93b1dc3d25..1d8ab1e568 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -800,7 +800,7 @@ mail_account_gui_new (MailConfigAccount *account) gui->organization = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_organization")); gui->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui->xml, "fileentry_signature")); gui->html_signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui->xml, "fileentry_html_signature")); - gui->has_html_signature = GTK_CHECK_BUTTON (glade_xml_get_widget (gui->xml, "check_html_signature")); + gui->has_html_signature = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "check_html_signature")); gnome_file_entry_set_default_path (gui->signature, g_get_home_dir ()); gnome_file_entry_set_default_path (gui->html_signature, g_get_home_dir ()); if (account->id) { diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index ac1d58ab19..03411b5433 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -188,9 +188,11 @@ free_send_data(void) list = folder_browser_factory_get_control_list (); for (it = e_list_get_iterator (list); e_iterator_is_valid (it); e_iterator_next (it)) { - BonoboControl *control = e_iterator_get (it); + BonoboControl *control = (BonoboControl *) e_iterator_get (it); if (control) { - FolderBrowser *fb = bonobo_control_get_widget (control); + FolderBrowser *fb; + + fb = FOLDER_BROWSER (bonobo_control_get_widget (control)); if (fb && fb->folder) mail_sync_folder (fb->folder, NULL, NULL); } diff --git a/mail/mail.h b/mail/mail.h index 50fdafc534..18108c7293 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -76,3 +76,4 @@ int mail_storages_count (void); void evolution_folder_info_factory_init (void); + -- cgit v1.2.3