diff options
52 files changed, 360 insertions, 192 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index e977228b01..1a777dc27d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2001-03-29 Kjartan Maraas <kmaraas@gnome.org> + + * *.*: Cleaned up #includes. Remove unneccesary includes of + <gnome.h>, <gtk/gtk.h>, <bonobo.h> and replaced with more + fine grained headers where needed. Also marked a bunch of + strings for translations and added some missing prototypes. + 2001-03-29 Dan Winship <danw@ximian.com> * mail-account-editor.c (switch_page): Fix this so the "Receiving diff --git a/mail/component-factory.c b/mail/component-factory.c index 3485919cce..791faf201b 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -25,7 +25,8 @@ #include <config.h> #endif -#include <bonobo.h> +#include <bonobo/bonobo-generic-factory.h> +#include <gal/widgets/e-gui-utils.h> #include "camel.h" @@ -36,6 +37,7 @@ #include "evolution-shell-component.h" #include "folder-browser.h" #include "mail.h" /* YUCK FIXME */ +#include "mail-config.h" #include "mail-tools.h" #include "mail-ops.h" #include "mail-local.h" @@ -44,7 +46,6 @@ #include "mail-importer.h" #include "mail-vfolder.h" /* vfolder_create_storage */ #include "openpgp-utils.h" -#include <gal/widgets/e-gui-utils.h> #include "component-factory.h" diff --git a/mail/evolution-outlook-importer.c b/mail/evolution-outlook-importer.c index d78f2ad7f8..5ab83ba609 100644 --- a/mail/evolution-outlook-importer.c +++ b/mail/evolution-outlook-importer.c @@ -26,13 +26,15 @@ #include <config.h> #endif -#include "evolution-outlook-importer.h" - #include <stdio.h> #include <importer/evolution-importer.h> #include <importer/GNOME_Evolution_Importer.h> +#include <camel/camel-exception.h> + +#include "evolution-outlook-importer.h" + #include "mail-importer.h" #include "mail-tools.h" diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index fd236e5994..45d5a17cd7 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -8,14 +8,16 @@ * (C) 2000 Helix Code, Inc. */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif -#include <gnome.h> #include <bonobo/bonobo-main.h> #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-ui-component.h> +#include <bonobo/bonobo-ui-util.h> #include <gal/util/e-util.h> #include <gal/widgets/e-gui-utils.h> diff --git a/mail/folder-browser-factory.h b/mail/folder-browser-factory.h index f55a069ede..ec49e0524d 100644 --- a/mail/folder-browser-factory.h +++ b/mail/folder-browser-factory.h @@ -11,7 +11,7 @@ #ifndef _FOLDER_BROWSER_FACTORY_H #define _FOLDER_BROWSER_FACTORY_H -#include <bonobo.h> +#include <bonobo/bonobo-control.h> #include "Evolution.h" #include "e-util/e-list.h" diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 44972c11f5..37267950ec 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -7,24 +7,18 @@ * * (C) 2000, 2001 Ximian, Inc. */ + +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <ctype.h> -#include <gnome.h> -#include "e-util/e-sexp.h" -#include "folder-browser.h" -#include "mail.h" -#include "mail-callbacks.h" -#include "mail-tools.h" -#include "message-list.h" -#include "mail-ops.h" -#include "mail-vfolder.h" -#include "mail-autofilter.h" -#include "mail-mlist-magic.h" -#include "mail-mt.h" +#include <gdk/gdkkeysyms.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> #include <gal/e-paned/e-vpaned.h> +#include <gal/widgets/e-popup-menu.h> #include "filter/vfolder-rule.h" #include "filter/vfolder-context.h" @@ -32,12 +26,21 @@ #include "filter/filter-input.h" #include "mail-search-dialogue.h" +#include "e-util/e-sexp.h" +#include "folder-browser.h" +#include "mail.h" +#include "mail-callbacks.h" +#include "mail-tools.h" +#include "message-list.h" +#include "mail-ops.h" +#include "mail-vfolder.h" +#include "mail-autofilter.h" +#include "mail-mlist-magic.h" +#include "mail-mt.h" #include "mail-local.h" #include "mail-config.h" -#include <gal/widgets/e-popup-menu.h> - #define d(x) x #define PARENT_TYPE (gtk_table_get_type ()) diff --git a/mail/folder-browser.h b/mail/folder-browser.h index 0cf7feb1ee..b7c424dfbd 100644 --- a/mail/folder-browser.h +++ b/mail/folder-browser.h @@ -4,7 +4,6 @@ #ifndef _FOLDER_BROWSER_H_ #define _FOLDER_BROWSER_H_ -#include "mail-types.h" #include <gtk/gtktable.h> #include "camel/camel-stream.h" #include <bonobo/bonobo-property-bag.h> @@ -14,6 +13,7 @@ #include "filter/filter-context.h" /*eek*/ #include "message-list.h" #include "mail-display.h" +#include "mail-types.h" #include "shell/Evolution.h" diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index aa701d9f25..b1677161c7 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -25,20 +25,20 @@ #include <config.h> #endif +#include <stdio.h> + #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-generic-factory.h> -#include <stdio.h> +#include <camel/camel-exception.h> +#include <camel/camel-mime-message.h> +#include <camel/camel-mime-parser.h> +#include <camel/camel-mime-part.h> #include <importer/evolution-importer.h> #include <importer/GNOME_Evolution_Importer.h> -#include "mail-importer.h" - -#include <camel/camel-exception.h> -#include <camel/camel-mime-parser.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-mime-message.h> +#include "mail/mail-importer.h" #include "mail-tools.h" #define IMPORTER_DEBUG diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c index 7f8a361697..06267992b5 100644 --- a/mail/importers/evolution-outlook-importer.c +++ b/mail/importers/evolution-outlook-importer.c @@ -34,9 +34,13 @@ #include <importer/evolution-importer.h> #include <importer/GNOME_Evolution_Importer.h> +#include <camel/camel-exception.h> + +#include "e-util/e-memory.h" + #include "mail-importer.h" +#include "mail-tools.h" -#include <camel/camel-exception.h> #define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory" @@ -63,6 +67,10 @@ struct oe_msg_segmentheader { typedef struct oe_msg_segmentheader oe_msg_segmentheader; +/* Prototype */ + +void mail_importer_module_init (void); + /* EvolutionImporter methods */ @@ -260,7 +268,7 @@ load_file_fn (EvolutionImporter *eimporter, if (folderpath == NULL) importer->folder = mail_tool_get_local_inbox (NULL); else - importer->folder = mail_tool_uri_to_folder (folderpath); + importer->folder = mail_tool_uri_to_folder (folderpath, NULL); if (importer->folder == NULL){ g_warning ("Bad folder"); diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c index 9a6ec5eac9..64effc7b4d 100644 --- a/mail/importers/netscape-importer.c +++ b/mail/importers/netscape-importer.c @@ -34,7 +34,6 @@ #include <dirent.h> #include <glib.h> -#include <gnome.h> #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-generic-factory.h> diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index cfc32b1975..310eea3483 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -34,7 +34,6 @@ #include <dirent.h> #include <glib.h> -#include <gnome.h> #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-generic-factory.h> @@ -74,6 +73,11 @@ typedef struct { char *path; } PineFolder; +/* Prototype */ + +void mail_importer_module_init (void); + + static gboolean pine_is_mbox (const char *filename) { diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c index 7656732f75..58fee4f465 100644 --- a/mail/mail-account-editor.c +++ b/mail/mail-account-editor.c @@ -22,15 +22,22 @@ * */ -#include "mail-account-editor.h" -#include "mail-session.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libgnomeui/gnome-messagebox.h> +#include <libgnomeui/gnome-stock.h> #include <camel/camel-url.h> #include <gal/widgets/e-unicode.h> #include <gal/widgets/e-gui-utils.h> +#include "mail-account-editor.h" +#include "mail-session.h" + static void mail_account_editor_class_init (MailAccountEditorClass *class); static void mail_account_editor_finalize (GtkObject *obj); diff --git a/mail/mail-account-editor.h b/mail/mail-account-editor.h index ad4bec94bb..265f86d321 100644 --- a/mail/mail-account-editor.h +++ b/mail/mail-account-editor.h @@ -29,6 +29,7 @@ extern "C" { #endif /* __cplusplus */ #include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-file-entry.h> #include "mail-account-gui.h" #define MAIL_ACCOUNT_EDITOR_TYPE (mail_account_editor_get_type ()) diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index e3c2071cb4..aa9fe6c2aa 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -22,7 +22,9 @@ * */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <string.h> diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index 7bb2f5ca9e..ab0ccbe5e9 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -20,18 +20,22 @@ * */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif -#include "mail-accounts.h" -#include "mail-config.h" -#include "mail-config-druid.h" -#include "mail-account-editor.h" #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libgnomeui/gnome-stock.h> #include <camel/camel-url.h> #include <openpgp-utils.h> +#include "mail-accounts.h" +#include "mail-config.h" +#include "mail-config-druid.h" +#include "mail-account-editor.h" + static void mail_accounts_dialog_class_init (MailAccountsDialogClass *class); static void mail_accounts_dialog_init (MailAccountsDialog *dialog); static void mail_accounts_dialog_finalise (GtkObject *obj); @@ -132,12 +136,48 @@ load_accounts (MailAccountsDialog *dialog) gtk_clist_thaw (dialog->mail_accounts); } -#ifdef ENABLE_NTTP +#ifdef ENABLE_NNTP static void load_news (MailAccountsDialog *dialog) { - /* FIXME: implement */ - ; + const MailConfigAccount *account; + const GSList *node = dialog->accounts; + int i = 0; + + gtk_clist_freeze (dialog->news_accounts); + + gtk_clist_clear (dialog->news_accounts); + + while (node) { + CamelURL *url; + gchar *text[3]; + + account = node->data; + + if (account->source->url) + url = camel_url_new (account->source->url, NULL); + else + url = NULL; + + text[0] = (account->source && account->source->enabled) ? "+" : ""; + text[1] = account->name; + text[2] = g_strdup_printf ("%s%s", url && url->protocol ? url->protocol : _("None"), + account->default_account ? _(" (default)") : ""); + + if (url) + camel_url_free (url); + + gtk_clist_append (dialog->news_accounts, text); + g_free (text[2]); + + /* set the account on the row */ + gtk_clist_set_row_data (dialog->news_accounts, i, (gpointer) account); + + node = node->next; + i++; + } + + gtk_clist_thaw (dialog->news_accounts); } #endif @@ -332,17 +372,26 @@ news_unselect (GtkCList *clist, gint row, gint column, GdkEventButton *event, gp } static void -news_add_finish_clicked () +news_add_finished(GtkWidget *widget, gpointer data) { - /* FIXME: uhm, yea... */ - ; + /* Either Cancel or Finished was clicked in the druid so reload the accounts */ + MailAccountsDialog *dialog = data; + + dialog->accounts = mail_config_get_accounts (); + load_accounts (dialog); } static void news_add (GtkButton *button, gpointer data) { - /* FIXME: do stuff */ - ; + MailAccountsDialog *dialog = data; + MailConfigDruid *druid; + + druid = mail_config_druid_new (dialog->shell); + gtk_signal_connect (GTK_OBJECT (druid), "destroy", + GTK_SIGNAL_FUNC (news_add_finished), dialog); + + gtk_widget_show (GTK_WIDGET (druid)); } static void @@ -512,7 +561,7 @@ construct (MailAccountsDialog *dialog) gtk_signal_connect (GTK_OBJECT (dialog->mail_able), "clicked", GTK_SIGNAL_FUNC (mail_able), dialog); -#if defined (ENABLE_NNTP) +#ifdef ENABLE_NNTP dialog->news_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts")); gtk_signal_connect (GTK_OBJECT (dialog->news_accounts), "select-row", GTK_SIGNAL_FUNC (news_select), dialog); diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h index 6cee8f23ab..1d9bb65eb0 100644 --- a/mail/mail-accounts.h +++ b/mail/mail-accounts.h @@ -28,10 +28,15 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#include <gnome.h> +#include <gtk/gtkclist.h> +#include <gtk/gtkcheckbutton.h> +#include <gtk/gtkspinbutton.h> +#include <libgnomeui/gnome-color-picker.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-file-entry.h> #include <glade/glade.h> #include <camel.h> -#include "shell/Evolution.h" +#include <shell/Evolution.h> #define MAIL_ACCOUNTS_DIALOG_TYPE (mail_accounts_dialog_get_type ()) #define MAIL_ACCOUNTS_DIALOG(o) (GTK_CHECK_CAST ((o), MAIL_ACCOUNTS_DIALOG_TYPE, MailAccountsDialog)) diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index 807667c152..e2e783342e 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -28,9 +28,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <ctype.h> -#include <bonobo.h> +#include <ctype.h> #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-app-helper.h> diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index ab36b68d33..ee2d00414a 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -26,10 +26,10 @@ #ifndef _MAIL_AUTOFILTER_H #define _MAIL_AUTOFILTER_H -#include "filter/filter-rule.h" -#include "filter/filter-context.h" -#include "filter/vfolder-context.h" -#include "camel/camel-mime-message.h" +#include <filter/filter-rule.h> +#include <filter/filter-context.h> +#include <filter/vfolder-context.h> +#include <camel/camel-mime-message.h> enum { AUTO_SUBJECT = 1, diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 1e453b98ea..dba36b8c57 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -25,11 +25,19 @@ * USA */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <errno.h> -#include <gnome.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-dialog-util.h> +#include <libgnomeui/gnome-stock.h> #include <libgnomeprint/gnome-print-master.h> #include <libgnomeprint/gnome-print-master-preview.h> +#include <gal/e-table/e-table.h> +#include <gal/widgets/e-gui-utils.h> +#include <filter/filter-editor.h> #include "mail.h" #include "mail-callbacks.h" #include "mail-config.h" @@ -43,9 +51,6 @@ #include "mail-vfolder.h" #include "folder-browser.h" #include "subscribe-dialog.h" -#include "filter/filter-editor.h" -#include <gal/e-table/e-table.h> -#include <gal/widgets/e-gui-utils.h> #include "e-messagebox.h" /* FIXME: is there another way to do this? */ diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h index d04e126d50..c856c201c1 100644 --- a/mail/mail-callbacks.h +++ b/mail/mail-callbacks.h @@ -23,10 +23,9 @@ #ifndef MAIL_CALLBACKS_H #define MAIL_CALLBACKS_H -#include <gnome.h> #include <camel/camel.h> #include "composer/e-msg-composer.h" -#include "mail-types.h" +#include <mail/mail-types.h> #include "evolution-storage.h" #ifdef __cplusplus diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index 63207007eb..6b99bd4a4a 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -22,8 +22,17 @@ * */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#include <sys/types.h> +#include <sys/utsname.h> +#include <string.h> +#include <unistd.h> + +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-dialog-util.h> #include <glade/glade.h> #include <gtkhtml/gtkhtml.h> #include <gal/widgets/e-unicode.h> @@ -32,10 +41,6 @@ #include "mail-ops.h" #include "mail.h" #include "mail-session.h" -#include <sys/types.h> -#include <string.h> -#include <unistd.h> -#include <sys/utsname.h> static void mail_config_druid_class_init (MailConfigDruidClass *class); static void mail_config_druid_finalize (GtkObject *obj); diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h index cc37c5aaaa..8192cd8ec4 100644 --- a/mail/mail-config-druid.h +++ b/mail/mail-config-druid.h @@ -28,7 +28,8 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#include <gnome.h> +#include <libgnomeui/gnome-druid.h> +#include <libgnomeui/gnome-file-entry.h> #include <glade/glade.h> #include <camel.h> #include "shell/Evolution.h" diff --git a/mail/mail-config.c b/mail/mail-config.c index 7c0efea6d1..be685ba180 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -20,16 +20,21 @@ * */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <pwd.h> #include <ctype.h> -#include <gnome.h> +#include <glib.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-config.h> #include <gtkhtml/gtkhtml.h> #include <glade/glade.h> #include <gal/util/e-util.h> -#include "e-util/e-html-utils.h" +#include <e-util/e-html-utils.h> #include "mail.h" #include "mail-config.h" #include "mail-ops.h" diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c index 2d21a2e2d8..0a5d1b06ee 100644 --- a/mail/mail-crypto.c +++ b/mail/mail-crypto.c @@ -20,16 +20,18 @@ * */ - +#ifdef HAVE_CONFIG_H #include <config.h> +#endif #include <stdlib.h> #include <string.h> +#include <camel/camel-mime-filter-from.h> + #include "mail-crypto.h" #include "mail-session.h" -#include <camel/camel-mime-filter-from.h> /** rfc2015 stuff (aka PGP/MIME) *******************************/ diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h index 746320082e..96fe5cb19e 100644 --- a/mail/mail-crypto.h +++ b/mail/mail-crypto.h @@ -23,7 +23,6 @@ #ifndef MAIL_CRYPTO_H #define MAIL_CRYPTO_H -#include <gnome.h> #include <camel/camel.h> #include "openpgp-utils.h" diff --git a/mail/mail-display.c b/mail/mail-display.c index dcd9729f5f..5a405abdf2 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -8,37 +8,41 @@ * * (C) 2000 Helix Code, Inc. */ + +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <sys/stat.h> #include <ctype.h> #include <fcntl.h> #include <errno.h> -#include <gnome.h> -#include "e-util/e-html-utils.h" -#include <gal/util/e-util.h> -#include <gal/widgets/e-popup-menu.h> -#include "mail-display.h" -#include "mail-config.h" -#include "mail.h" -#include "art/empty.xpm" - -#include "mail-ops.h" -#include "mail-mt.h" - -#include <bonobo.h> #include <libgnorba/gnorba.h> -#include <bonobo/bonobo-stream-memory.h> #include <libgnomevfs/gnome-vfs-mime-info.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> - +#include <bonobo/bonobo-control-frame.h> +#include <bonobo/bonobo-stream-memory.h> #include <bonobo/bonobo-ui-toolbar-icon.h> +#include <bonobo/bonobo-widget.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf-loader.h> +#include <gal/util/e-util.h> +#include <gal/widgets/e-popup-menu.h> #include <gtkhtml/gtkhtml-embedded.h> #include <gtkhtml/htmlengine.h> /* XXX */ -#include <gtkhtml/htmlobject.h> /* XXX */ -#include <gtkhtml/htmlinterval.h> /* XXX */ +#include <gtkhtml/htmlobject.h> /* XXX */ #include <gtkhtml/htmltext.h> /* XXX */ +#include <gtkhtml/htmlinterval.h> /* XXX */ + +#include <e-util/e-html-utils.h> + +#include "mail-display.h" +#include "mail-config.h" +#include "mail.h" +#include "art/empty.xpm" + +#include "mail-ops.h" +#include "mail-mt.h" #define PARENT_TYPE (gtk_vbox_get_type ()) diff --git a/mail/mail-format.c b/mail/mail-format.c index f6a145294e..6cc6cccc1c 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -23,24 +23,29 @@ * */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + +#include <ctype.h> /* for isprint */ +#include <string.h> /* for strstr */ +#include <fcntl.h> + +#include <liboaf/liboaf.h> +#include <libgnome/libgnome.h> +#include <libgnomevfs/gnome-vfs-mime-info.h> +#include <libgnomevfs/gnome-vfs-mime-handlers.h> +#include <gal/widgets/e-unicode.h> + +#include <camel/camel-mime-utils.h> +#include <shell/e-setup.h> +#include <e-util/e-html-utils.h> + #include "mail.h" #include "mail-tools.h" #include "mail-display.h" #include "mail-crypto.h" #include "mail-mt.h" -#include "shell/e-setup.h" -#include "e-util/e-html-utils.h" -#include <gal/widgets/e-unicode.h> -#include <camel/camel-mime-utils.h> -#include <libgnome/libgnome.h> -#include <libgnomevfs/gnome-vfs-mime-info.h> -#include <libgnomevfs/gnome-vfs-mime-handlers.h> -#include <liboaf/liboaf.h> - -#include <ctype.h> /* for isprint */ -#include <string.h> /* for strstr */ -#include <fcntl.h> static char *get_data_wrapper_text (CamelDataWrapper *data); diff --git a/mail/mail-identify.c b/mail/mail-identify.c index e8b5f96a48..731c3d9fcc 100644 --- a/mail/mail-identify.c +++ b/mail/mail-identify.c @@ -22,7 +22,9 @@ * */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif #include <stdlib.h> #include <string.h> diff --git a/mail/mail-importer.c b/mail/mail-importer.c index 85dfe5a57a..dd30807645 100644 --- a/mail/mail-importer.c +++ b/mail/mail-importer.c @@ -25,19 +25,20 @@ #include <config.h> #endif -#include <bonobo.h> -#include "mail-importer.h" -#include "mail-local.h" -#include "mail.h" - +#include <dirent.h> +#include <gmodule.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-util.h> #include <evolution-storage.h> #include <camel/camel-folder.h> #include <camel/camel-mime-message.h> #include <camel/camel-stream-mem.h> #include <camel/camel-exception.h> -#include <dirent.h> -#include <gmodule.h> +#include "mail-importer.h" +#include "mail-local.h" +#include "mail.h" + static GList *importer_modules = NULL; @@ -45,6 +46,10 @@ extern char *evolution_dir; static GNOME_Evolution_LocalStorage local_storage = NULL; +/* Prototype */ + +void mail_importer_uninit (void); + /** * mail_importer_create_folder: * parent_path: The path of the parent folder. diff --git a/mail/mail-importer.h b/mail/mail-importer.h index bab2ff5574..350671a8ad 100644 --- a/mail/mail-importer.h +++ b/mail/mail-importer.h @@ -24,10 +24,10 @@ #ifndef __MAIL_IMPORTER_H__ #define __MAIL_IMPORTER_H__ +#include <bonobo/bonobo-listener.h> #include <camel/camel-folder.h> #include <camel/camel-stream-mem.h> #include <evolution-shell-client.h> -#include <bonobo/bonobo-listener.h> typedef struct _MailImporter MailImporter; struct _MailImporter { diff --git a/mail/mail-local.c b/mail/mail-local.c index 489f426046..c1c6ff54c7 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -34,14 +34,15 @@ the maintainer of this information. */ + #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <bonobo.h> +#include <gnome-xml/xmlmemory.h> #include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-dialog-util.h> #include <glade/glade.h> -#include <gnome-xml/xmlmemory.h> #include "Evolution.h" #include "evolution-storage.h" diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 60fbfaffc0..9c04ca38ef 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -1,24 +1,33 @@ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <unistd.h> - -#include "e-util/e-msgport.h" -#include "camel/camel-operation.h" -#include <glib.h> #include <pthread.h> -#include "mail-mt.h" +#include <glib.h> -#include <gtk/gtk.h> +#include <gtk/gtkentry.h> +#include <gtk/gtkmain.h> +#include <gtk/gtklabel.h> +#include <gtk/gtkprogress.h> +#include <gtk/gtkprogressbar.h> +#include <gtk/gtktable.h> +#include <gtk/gtkwidget.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> #include <libgnomeui/gnome-dialog.h> -#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-stock.h> #include <gal/widgets/e-gui-utils.h> #include "folder-browser-factory.h" +#include "e-util/e-msgport.h" +#include "camel/camel-operation.h" -#include <libgnomeui/gnome-dialog.h> -#include <gtk/gtkprogress.h> +#include "mail-mt.h" /*#define MALLOC_CHECK*/ #define d(x) diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 68b9e0d971..a0bf80ce92 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -25,8 +25,11 @@ * USA */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif +/* #include <ctype.h> */ #include <errno.h> #include <gal/util/e-util.h> #include <camel/camel-mime-filter-from.h> @@ -698,7 +701,7 @@ send_queue_send(struct _mail_msg *mm) CamelMessageInfo *info; int pc = (100 * i) / uids->len; - report_status (m, CAMEL_FILTER_STATUS_START, pc, "Sending message %d of %d", i+1, uids->len); + report_status (m, CAMEL_FILTER_STATUS_START, pc, _("Sending message %d of %d"), i+1, uids->len); info = camel_folder_get_message_info (m->queue, uids->pdata[i]); if (info && info->flags & CAMEL_MESSAGE_DELETED) @@ -717,9 +720,9 @@ send_queue_send(struct _mail_msg *mm) } if (camel_exception_is_set (&mm->ex)) - report_status (m, CAMEL_FILTER_STATUS_END, 100, "Failed on message %d of %d", i+1, uids->len); + report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d of %d"), i+1, uids->len); else - report_status (m, CAMEL_FILTER_STATUS_END, 100, "Complete."); + report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); camel_folder_free_uids (m->queue, uids); diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c index c89148f4ba..0f633edeba 100644 --- a/mail/mail-search-dialogue.c +++ b/mail/mail-search-dialogue.c @@ -18,9 +18,15 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef HAVE_CONFIG_H #include <config.h> -#include <gtk/gtk.h> -#include <gnome.h> +#endif + +#include <glib.h> +#include <gtk/gtkentry.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-stock.h> #include "mail-search-dialogue.h" diff --git a/mail/mail-search-dialogue.h b/mail/mail-search-dialogue.h index f952bebaf6..3c50d249e1 100644 --- a/mail/mail-search-dialogue.h +++ b/mail/mail-search-dialogue.h @@ -21,7 +21,7 @@ #ifndef _MAIL_SEARCH_DIALOGUE_H #define _MAIL_SEARCH_DIALOGUE_H -#include <gtk/gtk.h> +#include <gtk/gtkwidget.h> #include <libgnomeui/gnome-dialog.h> #include "filter/rule-context.h" diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index f7b5691498..2b300272f3 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -20,12 +20,20 @@ * */ -#include "config.h" -#include "mail-send-recv.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <string.h> +/* for the dialogue stuff */ +#include <glib.h> +#include <gtk/gtkmain.h> +#include <libgnomeui/gnome-stock.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-window-icon.h> + #include "filter/filter-context.h" #include "filter/filter-filter.h" #include "camel/camel-filter-driver.h" @@ -40,13 +48,7 @@ #include "mail-session.h" #include "mail-tools.h" #include "mail-ops.h" - -/* for the dialogue stuff */ -#include <glib.h> -#include <gtk/gtk.h> -#include <libgnomeui/gnome-stock.h> -#include <libgnomeui/gnome-dialog.h> -#include <libgnomeui/gnome-window-icon.h> +#include "mail-send-recv.h" #define d(x) diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index ef3a502b4c..6ea0bc4757 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -23,8 +23,6 @@ #ifndef MAIL_SEND_RECV_H #define MAIL_SEND_RECV_H -#include <gnome.h> - #ifdef __cplusplus extern "C" { #pragma } diff --git a/mail/mail-session.h b/mail/mail-session.h index b415d5ded3..bd2b5b290b 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -23,8 +23,8 @@ #ifndef MAIL_SESSION_H #define MAIL_SESSION_H -#include <gnome.h> -#include <bonobo.h> +#include <glib.h> +#include <bonobo/bonobo-ui-component.h> #include <camel/camel-session.h> #ifdef __cplusplus diff --git a/mail/mail-summary.c b/mail/mail-summary.c index fb7b88ce8b..94057e53ab 100644 --- a/mail/mail-summary.c +++ b/mail/mail-summary.c @@ -25,11 +25,9 @@ #include <config.h> #endif -#include <bonobo.h> #include <bonobo/bonobo-property-bag.h> #include "camel.h" -#include <gnome.h> #include "mail.h" #include "mail-tools.h" #include "mail-ops.h" diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 9f78e100b9..c78182128d 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -25,7 +25,10 @@ * USA */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <ctype.h> #include <errno.h> #include "camel/camel.h" diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 42482c4c95..cd269cb183 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -11,7 +11,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <bonobo.h> + +#include <libgnomeui/gnome-stock.h> #include "Evolution.h" #include "evolution-storage.h" diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index aa53fbbe60..5a365b0a50 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -2,8 +2,6 @@ #ifndef _MAIL_VFOLDER_H #define _MAIL_VFOLDER_H -#include <bonobo.h> - #include "Evolution.h" #include "evolution-storage.h" #include "evolution-shell-component.h" diff --git a/mail/mail-view.c b/mail/mail-view.c index d70c9d4bca..196533b6d5 100644 --- a/mail/mail-view.c +++ b/mail/mail-view.c @@ -20,7 +20,13 @@ * */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + +#include <libgnomeui/gnome-app.h> +#include <libgnomeui/gnome-app-helper.h> +#include <libgnomeui/gnome-stock.h> #include "mail.h" #include "mail-ops.h" #include "camel/camel.h" diff --git a/mail/mail.h b/mail/mail.h index ed90d4024e..f0f2fa0ee6 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -19,10 +19,11 @@ /* This file is a F*CKING MESS. Shame to us! */ -#include <gtkhtml/gtkhtml.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> -#include "camel/camel.h" -#include "composer/e-msg-composer.h" +#include <gtkhtml/gtkhtml.h> +#include <camel/camel.h> +#include <composer/e-msg-composer.h> +#include <shell/evolution-storage.h> #include "mail-accounts.h" #include "mail-account-editor.h" #include "mail-callbacks.h" @@ -31,7 +32,6 @@ /*#include "folder-browser.h"*/ #include "mail-session.h" #include "mail-types.h" -#include "shell/evolution-storage.h" extern char *evolution_dir; diff --git a/mail/main.c b/mail/main.c index fdc718c200..9e9ea168e7 100644 --- a/mail/main.c +++ b/mail/main.c @@ -7,11 +7,14 @@ * (C) 2000 Helix Code, Inc. */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif #include <signal.h> -#include <gnome.h> +#include <libgnome/gnome-defs.h> +#include <libgnomeui/gnome-init.h> #include <bonobo/bonobo-main.h> #include <bonobo/bonobo-object-directory.h> #include <glade/glade.h> diff --git a/mail/message-list.c b/mail/message-list.c index 6cdf3f7b9f..24e4c9c61c 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -11,36 +11,37 @@ * (C) 2000 Helix Code, Inc. */ +#ifdef HAVE_CONFIG_H #include <config.h> -#include <camel/camel-exception.h> -#include <camel/camel-folder.h> -#include <e-util/ename/e-name-western.h> -#include <camel/camel-folder-thread.h> -#include <camel/camel-vtrash-folder.h> -#include <e-util/e-memory.h> +#endif #include <string.h> #include <ctype.h> -#include "mail-config.h" -#include "message-list.h" -#include "mail-mt.h" -#include "mail-tools.h" -#include "mail-ops.h" -#include "Mail.h" - #include <gal/util/e-util.h> #include <gal/widgets/e-gui-utils.h> - #include <gal/e-table/e-cell-text.h> #include <gal/e-table/e-cell-toggle.h> #include <gal/e-table/e-cell-checkbox.h> #include <gal/e-table/e-cell-tree.h> #include <gal/e-table/e-cell-date.h> #include <gal/e-table/e-cell-size.h> - +#include <gal/e-table/e-tree-memory.h> #include <gal/e-table/e-tree-memory-callbacks.h> +#include <camel/camel-exception.h> +#include <camel/camel-folder.h> +#include <e-util/ename/e-name-western.h> +#include <camel/camel-folder-thread.h> +#include <e-util/e-memory.h> + +#include "mail-config.h" +#include "message-list.h" +#include "mail-mt.h" +#include "mail-tools.h" +#include "mail-ops.h" +#include "Mail.h" + #include "art/mail-new.xpm" #include "art/mail-read.xpm" #include "art/mail-replied.xpm" diff --git a/mail/message-list.h b/mail/message-list.h index 7d7e6b283b..90204bc3bd 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -2,12 +2,13 @@ #ifndef _MESSAGE_LIST_H_ #define _MESSAGE_LIST_H_ -/*#include <gnome.h>*/ -#include <gtk/gtk.h> +#include <gtk/gtkobject.h> +#include <gtk/gtkwidget.h> -#include "mail-types.h" +#include <gal/e-table/e-table-simple.h> +#include <gal/e-table/e-tree-simple.h> #include <gal/e-table/e-tree-scrolled.h> -#include <gal/e-table/e-tree-model.h> +#include "mail-types.h" #define MESSAGE_LIST_TYPE (message_list_get_type ()) #define MESSAGE_LIST(o) (GTK_CHECK_CAST ((o), MESSAGE_LIST_TYPE, MessageList)) diff --git a/mail/openpgp-utils.c b/mail/openpgp-utils.c index ff74596f6c..c68797c398 100644 --- a/mail/openpgp-utils.c +++ b/mail/openpgp-utils.c @@ -23,12 +23,9 @@ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif -#include <gnome.h> /* for _() macro */ -#include "openpgp-utils.h" -#include "mail-session.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -50,6 +47,12 @@ #include <iconv.h> +#include <glib.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> /* for _() macro */ +#include "openpgp-utils.h" +#include "mail-session.h" + #define d(x) struct _PgpValidity { diff --git a/mail/session.c b/mail/session.c index 372d104839..d4ef2293f6 100644 --- a/mail/session.c +++ b/mail/session.c @@ -21,9 +21,16 @@ * */ +#ifdef HAVE_CONFIG_H #include <config.h> -#include <gnome.h> +#endif + #include <stdlib.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-config.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-dialog-util.h> +#include <libgnomeui/gnome-stock.h> #include "mail.h" #include "mail-session.h" #include "mail-mt.h" diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c index 271f58f0f5..657661c01d 100644 --- a/mail/subscribe-dialog.c +++ b/mail/subscribe-dialog.c @@ -21,10 +21,18 @@ * */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + +#include <bonobo/bonobo-main.h> +#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-generic-factory.h> +#include <bonobo/bonobo-control.h> +#include <bonobo/bonobo-ui-component.h> +#include <bonobo/bonobo-ui-util.h> +#include <bonobo/bonobo-widget.h> -#include "subscribe-dialog.h" -#include "e-util/e-html-utils.h" #include <gtkhtml/gtkhtml.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> @@ -43,20 +51,14 @@ #include <gal/e-paned/e-hpaned.h> -#include <bonobo/bonobo-main.h> -#include <bonobo/bonobo-object.h> -#include <bonobo/bonobo-generic-factory.h> -#include <bonobo/bonobo-control.h> -#include <bonobo/bonobo-ui-component.h> -#include <bonobo/bonobo-ui-util.h> -#include <bonobo/bonobo-widget.h> - +#include <e-util/e-html-utils.h> #include "mail.h" #include "mail-tools.h" #include "mail-mt.h" #include "camel/camel-exception.h" #include "camel/camel-store.h" #include "camel/camel-session.h" +#include "subscribe-dialog.h" #include "art/empty.xpm" #include "art/mark.xpm" @@ -888,7 +890,7 @@ subscribe_dialog_gui_init (SubscribeDialog *sc) CORBA_exception_init (&ev); /* Construct the app */ - sc->app = bonobo_window_new ("subscribe-dialog", "Manage Subscriptions"); + sc->app = bonobo_window_new ("subscribe-dialog", _("Manage Subscriptions")); /* Build the menu and toolbar */ container = bonobo_ui_container_new (); diff --git a/mail/subscribe-dialog.h b/mail/subscribe-dialog.h index 444a2ca548..c37c93080f 100644 --- a/mail/subscribe-dialog.h +++ b/mail/subscribe-dialog.h @@ -24,14 +24,14 @@ #ifndef _SUBSCRIBE_DIALOG_H_ #define _SUBSCRIBE_DIALOG_H_ -#include "mail-types.h" -#include "camel/camel-store.h" #include <gtk/gtktable.h> -#include <gal/e-table/e-tree-model.h> -#include <gal/e-table/e-table-model.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-property-bag.h> +#include <gal/e-table/e-tree-model.h> +#include <gal/e-table/e-table-model.h> #include "shell/evolution-storage.h" +#include "mail-types.h" +#include "camel/camel-store.h" #define SUBSCRIBE_DIALOG_TYPE (subscribe_dialog_get_type ()) #define SUBSCRIBE_DIALOG(o) (GTK_CHECK_CAST ((o), SUBSCRIBE_DIALOG_TYPE, SubscribeDialog)) diff --git a/mail/test-mail.c b/mail/test-mail.c index 6e240199cd..ae77a69722 100644 --- a/mail/test-mail.c +++ b/mail/test-mail.c @@ -9,9 +9,14 @@ #include <config.h> -#include <gnome.h> -#include <bonobo.h> +#include <gtk/gtkmain.h> +#include <gtk/gtkwidget.h> +#include <libgnome/gnome-defs.h> +#include <libgnomeui/gnome-init.h> #include <liboaf/liboaf.h> +#include <bonobo/bonobo-main.h> +#include <bonobo/bonobo-ui-container.h> +#include <bonobo/bonobo-widget.h> static guint create_container (void) |