diff options
83 files changed, 589 insertions, 677 deletions
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 5c925ce3de..c2f8bcbc48 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -529,7 +529,7 @@ eabc_type_changed(GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_type(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eabc_general_type(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkComboBox *dropdown; @@ -595,7 +595,7 @@ offline_status_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_name(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eabc_general_name(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; const gchar *uri; @@ -634,7 +634,7 @@ eabc_general_name(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str static GtkWidget * -eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eabc_general_offline(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *offline_setting; @@ -725,7 +725,7 @@ ssl_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) static GtkWidget * -eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eabc_general_host(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; const gchar *tmp; @@ -814,7 +814,7 @@ auth_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_auth(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eabc_general_auth(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; @@ -883,7 +883,7 @@ scope_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eabc_details_search(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; @@ -977,7 +977,7 @@ canbrowse_toggled_cb (GtkWidget *toggle_button, ESource *source) } static GtkWidget * -eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eabc_details_limit(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h index c10f29cfdd..0386d611e6 100644 --- a/addressbook/gui/component/addressbook-migrate.h +++ b/addressbook/gui/component/addressbook-migrate.h @@ -26,8 +26,6 @@ #include "addressbook-component.h" -struct _GError; - -gint addressbook_migrate (AddressbookComponent *component, gint major, gint minor, gint revision, struct _GError **err); +gint addressbook_migrate (AddressbookComponent *component, gint major, gint minor, gint revision, GError **err); #endif /* _ADDRESSBOOK_MIGRATE_H_ */ diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 72bafaa535..d8e0b2b5e1 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -29,15 +29,13 @@ #include <libebook/e-book.h> #include "e-addressbook-model.h" #include "eab-contact-display.h" +#include "eab-menu.h" #include "widgets/menus/gal-view-menus.h" #include "misc/e-search-bar.h" #include "misc/e-filter-bar.h" G_BEGIN_DECLS -struct _EABMenu; -struct _EABMenuTargetSelect; - /* EABView - A card displaying information about a contact. * * The following arguments are available: @@ -157,7 +155,7 @@ gboolean eab_view_can_stop (EABView *view); gboolean eab_view_can_copy_to_folder (EABView *view); gboolean eab_view_can_move_to_folder (EABView *view); -struct _EABMenuTargetSelect *eab_view_get_menu_target (EABView *view, struct _EABMenu *menu); +EABMenuTargetSelect *eab_view_get_menu_target (EABView *view, EABMenu *menu); G_END_DECLS diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 9ab4b10f98..6f2b74c755 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -25,13 +25,12 @@ #define __EAB_MENU_H__ #include <glib-object.h> +#include <libebook/e-book.h> #include "e-util/e-menu.h" G_BEGIN_DECLS -struct _EBook; - typedef struct _EABMenu EABMenu; typedef struct _EABMenuClass EABMenuClass; diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 32fbc9bd68..de7025fd96 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -211,7 +211,7 @@ name_changed (GtkEntry *entry, ECalConfigTargetSource *t) } static GtkWidget * -eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_get_source_name (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { static GtkWidget *label, *entry; gint row; @@ -252,7 +252,7 @@ offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog) } static GtkWidget * -eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; GtkWidget *offline_setting = NULL; @@ -318,7 +318,7 @@ choose_initial_color (void) } static GtkWidget * -eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_get_source_color (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; static GtkWidget *label, *color_button; @@ -431,7 +431,7 @@ cs_load_sources (CalendarSourceDialog *sdialog, const gchar *conf_key, ESourceGr * Show calendar properties for @source. **/ void -calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourceGroup *group) +calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *group) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -482,13 +482,13 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc } void -calendar_setup_new_calendar (struct _GtkWindow *parent) +calendar_setup_new_calendar (GtkWindow *parent) { calendar_setup_edit_calendar (parent, NULL, NULL); } void -calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source) +calendar_setup_edit_task_list (GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -538,13 +538,13 @@ calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source) } void -calendar_setup_new_task_list (struct _GtkWindow *parent) +calendar_setup_new_task_list (GtkWindow *parent) { calendar_setup_edit_task_list (parent, NULL); } void -calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source) +calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -594,7 +594,7 @@ calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source) } void -calendar_setup_new_memo_list (struct _GtkWindow *parent) +calendar_setup_new_memo_list (GtkWindow *parent) { calendar_setup_edit_memo_list (parent, NULL); } diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h index d92993c1a6..18dc042848 100644 --- a/calendar/gui/dialogs/calendar-setup.h +++ b/calendar/gui/dialogs/calendar-setup.h @@ -24,19 +24,20 @@ #ifndef __CALENDAR_SETUP_H__ #define __CALENDAR_SETUP_H__ -struct _GtkWindow; -struct _ESource; +#include <gtk/gtk.h> +#include <libedataserver/e-source.h> +#include <libedataserver/e-source-group.h> G_BEGIN_DECLS -void calendar_setup_edit_calendar (struct _GtkWindow *parent, struct _ESource *source, struct _ESourceGroup *group); -void calendar_setup_new_calendar (struct _GtkWindow *parent); +void calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *group); +void calendar_setup_new_calendar (GtkWindow *parent); -void calendar_setup_edit_task_list (struct _GtkWindow *parent, struct _ESource *source); -void calendar_setup_new_task_list (struct _GtkWindow *parent); +void calendar_setup_edit_task_list (GtkWindow *parent, ESource *source); +void calendar_setup_new_task_list (GtkWindow *parent); -void calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source); -void calendar_setup_new_memo_list (struct _GtkWindow *parent); +void calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source); +void calendar_setup_new_memo_list (GtkWindow *parent); G_END_DECLS diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index ed59ae29e6..2cd20ebd9d 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -25,17 +25,14 @@ #define __E_CAL_POPUP_H__ #include <glib-object.h> +#include <libedataserverui/e-source-selector.h> -#include "e-util/e-popup.h" +#include <e-util/e-popup.h> #include "dialogs/comp-editor.h" +#include "e-cal-model.h" G_BEGIN_DECLS -typedef struct _ECalPopup ECalPopup; -typedef struct _ECalPopupClass ECalPopupClass; - -struct _ECalendarView; - /** * enum _e_cal_popup_target_t - A list of mail popup target types. * @@ -141,7 +138,7 @@ typedef struct _ECalPopupTargetAttachments ECalPopupTargetAttachments; struct _ECalPopupTargetSelect { EPopupTarget target; - struct _ECalModel *model; + ECalModel *model; GPtrArray *events; }; @@ -156,7 +153,7 @@ struct _ECalPopupTargetSelect { struct _ECalPopupTargetSource { EPopupTarget target; - struct _ESourceSelector *selector; + ESourceSelector *selector; }; /** @@ -175,11 +172,15 @@ struct _ECalPopupTargetAttachments { typedef struct _EPopupItem ECalPopupItem; +typedef struct _ECalPopup ECalPopup; +typedef struct _ECalPopupClass ECalPopupClass; +typedef struct _ECalPopupPrivate ECalPopupPrivate; + /* The object */ struct _ECalPopup { EPopup popup; - struct _ECalPopupPrivate *priv; + ECalPopupPrivate *priv; }; struct _ECalPopupClass { @@ -190,8 +191,8 @@ GType e_cal_popup_get_type(void); ECalPopup *e_cal_popup_new(const gchar *menuid); -ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArray *events); -ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, struct _ESourceSelector *selector); +ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, ECalModel *model, GPtrArray *events); +ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector); /* ********************************************************************** */ diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 453ec1ff52..57cc811ae7 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -171,8 +171,8 @@ void e_calendar_view_modify_and_send (ECalComponent *comp, CalObjModType mod, GtkWindow *toplevel, gboolean new); -void e_calendar_utils_show_error_silent (struct _GtkWidget *widget); -void e_calendar_utils_show_info_silent(struct _GtkWidget *widget); +void e_calendar_utils_show_error_silent (GtkWidget *widget); +void e_calendar_utils_show_info_silent(GtkWidget *widget); gboolean e_calendar_view_get_tooltips (ECalendarViewEventData *data); diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index b0bbc8535b..978bad4c0b 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -32,15 +32,15 @@ #include <bonobo/bonobo-ui-component.h> #include <misc/e-calendar.h> #include <libecal/e-cal.h> +#include <e-util/e-popup.h> +#include "e-cal-menu.h" #include "e-calendar-table.h" G_BEGIN_DECLS -struct _EPopup; - #define GNOME_TYPE_CALENDAR (gnome_calendar_get_type ()) #define GNOME_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar)) #define GNOME_CALENDAR_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR, \ @@ -140,14 +140,14 @@ GtkWidget *gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal); GtkWidget *gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal); GtkWidget *gnome_calendar_get_tag (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal); void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic); void gnome_calendar_discard_view_menus (GnomeCalendar *gcal); -void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, struct _EPopup *ep, const gchar *prefix); +void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const gchar *prefix); void gnome_calendar_set_selected_time_range (GnomeCalendar *gcal, time_t start_time, diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h index d4bb33c448..78bc501599 100644 --- a/calendar/gui/migration.h +++ b/calendar/gui/migration.h @@ -29,9 +29,7 @@ #include "tasks-component.h" #include "memos-component.h" -struct _GError; - -gboolean migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, struct _GError **err); -gboolean migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, struct _GError **err); -gboolean migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, struct _GError **err); +gboolean migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, GError **err); +gboolean migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, GError **err); +gboolean migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, GError **err); #endif diff --git a/e-util/e-config.c b/e-util/e-config.c index 9336e778cd..412c00b649 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -65,8 +65,8 @@ struct _widget_node { struct _menu_node *context; EConfigItem *item; - struct _GtkWidget *widget; /* widget created by the factory, if any */ - struct _GtkWidget *frame; /* if created by us */ + GtkWidget *widget; /* widget created by the factory, if any */ + GtkWidget *frame; /* if created by us */ guint empty:1; /* set if empty (i.e. hidden) */ }; @@ -892,7 +892,7 @@ ec_dialog_response(GtkWidget *d, gint id, EConfig *ec) * Return value: The window widget. This is also stored in @emp.window. **/ GtkWidget * -e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const gchar *title) +e_config_create_window(EConfig *emp, GtkWindow *parent, const gchar *title) { GtkWidget *w; @@ -1341,7 +1341,7 @@ emph_free_group(struct _EConfigHookGroup *group) g_free(group); } -static struct _GtkWidget * +static GtkWidget * ech_config_widget_factory(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { struct _EConfigHookGroup *group = data; @@ -1355,7 +1355,7 @@ ech_config_widget_factory(EConfig *ec, EConfigItem *item, GtkWidget *parent, Gtk hdata.parent = parent; hdata.old = old; - return (struct _GtkWidget *)e_plugin_invoke(group->hook->hook.plugin, (gchar *)item->user_data, &hdata); + return (GtkWidget *)e_plugin_invoke(group->hook->hook.plugin, (gchar *)item->user_data, &hdata); } else return NULL; } diff --git a/e-util/e-config.h b/e-util/e-config.h index 2f2e4a2a3b..e6ff495520 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -24,14 +24,11 @@ #ifndef __E_CONFIG_H__ #define __E_CONFIG_H__ -#include <glib-object.h> -#include "libedataserver/e-msgport.h" +#include <gtk/gtk.h> +#include <libedataserver/e-msgport.h> G_BEGIN_DECLS -struct _GtkWindow; -struct _GtkWidget; - /* This is a config window management/merging class. */ typedef struct _EConfig EConfig; @@ -47,7 +44,7 @@ typedef gboolean (*EConfigCheckFunc)(EConfig *ec, const gchar *pageid, gpointer typedef void (*EConfigItemsFunc)(EConfig *ec, GSList *items, gpointer data); -typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data); +typedef GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *, GtkWidget *parent, GtkWidget *old, gpointer data); /* ok so this is all a bit bogussy we need to map to glade stuff instead */ @@ -161,7 +158,7 @@ struct _EConfigItem { **/ struct _EConfigTarget { struct _EConfig *config; - struct _GtkWidget *widget; /* used if you need a parent toplevel, if available */ + GtkWidget *widget; /* used if you need a parent toplevel, if available */ guint32 type; @@ -197,8 +194,8 @@ struct _EConfig { EConfigTarget *target; - struct _GtkWidget *widget; /* the generated internal */ - struct _GtkWidget *window; /* the window widget, GtkWindow or GtkDialog */ + GtkWidget *widget; /* the generated internal */ + GtkWidget *window; /* the window widget, GtkWindow or GtkDialog */ }; /** @@ -236,14 +233,14 @@ void e_config_add_items(EConfig *, GSList *items, EConfigItemsFunc commitfunc, E void e_config_add_page_check(EConfig *, const gchar *pageid, EConfigCheckFunc, gpointer data); void e_config_set_target(EConfig *emp, EConfigTarget *target); -struct _GtkWidget *e_config_create_widget(EConfig *); -struct _GtkWidget *e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const gchar *title); +GtkWidget *e_config_create_widget(EConfig *); +GtkWidget *e_config_create_window(EConfig *emp, GtkWindow *parent, const gchar *title); void e_config_target_changed(EConfig *emp, e_config_target_change_t how); gboolean e_config_page_check(EConfig *, const gchar *); -struct _GtkWidget *e_config_page_get(EConfig *ec, const gchar *pageid); +GtkWidget *e_config_page_get(EConfig *ec, const gchar *pageid); const gchar *e_config_page_next(EConfig *ec, const gchar *pageid); const gchar *e_config_page_prev(EConfig *ec, const gchar *pageid); @@ -295,8 +292,8 @@ struct _EConfigHookItemFactoryData { EConfig *config; EConfigItem *item; EConfigTarget *target; - struct _GtkWidget *parent; - struct _GtkWidget *old; + GtkWidget *parent; + GtkWidget *old; }; /** diff --git a/e-util/e-error.c b/e-util/e-error.c index 4215bfe7de..c78083495e 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -580,8 +580,8 @@ e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap) * Return value: A GtkDialog which can be used for showing an error * dialog asynchronously. **/ -struct _GtkWidget * -e_error_new(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) +GtkWidget * +e_error_new(GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) { GtkWidget *w; va_list ap; @@ -683,7 +683,7 @@ remove_parent(GtkWidget *w, GtkWidget *parent) * destruction state. **/ void -e_error_default_parent(struct _GtkWindow *parent) +e_error_default_parent(GtkWindow *parent) { if (g_slist_find(ee_parent_list, parent) == NULL) { ee_parent_list = g_slist_prepend(ee_parent_list, parent); diff --git a/e-util/e-error.h b/e-util/e-error.h index 6b66a6da31..7b9685aca6 100644 --- a/e-util/e-error.h +++ b/e-util/e-error.h @@ -26,8 +26,6 @@ #include <stdarg.h> #include <gtk/gtk.h> -struct _GtkWindow; - /* * Some standard errors, if these are altered or added to, * update devel-docs/misc/errors.txt @@ -50,14 +48,14 @@ struct _GtkWindow; #define E_ERROR_NO_LOAD_FILE "system:no-save-file" /* Note that all errors returned are standard GtkDialoge's */ -struct _GtkWidget *e_error_new(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); -struct _GtkWidget *e_error_newv(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); +GtkWidget *e_error_new(GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); +GtkWidget *e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); -gint e_error_run(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); -gint e_error_runv(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); +gint e_error_run(GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); +gint e_error_runv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); guint e_error_count_buttons (GtkDialog *dialog); -void e_error_default_parent(struct _GtkWindow *parent); +void e_error_default_parent(GtkWindow *parent); #endif /* !_E_ERROR_H */ diff --git a/e-util/e-import.c b/e-util/e-import.c index 4e2cdc3302..6f4c5947b4 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -211,7 +211,7 @@ void e_import_cancel(EImport *ei, EImportTarget *t, EImportImporter *im) * Return value: NULL if the importer doesn't support/require * a destination. **/ -struct _GtkWidget * +GtkWidget * e_import_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im) { g_return_val_if_fail(im != NULL, NULL); @@ -438,7 +438,7 @@ static gboolean eih_supported(EImport *ei, EImportTarget *target, EImportImporte return e_plugin_invoke(hook->hook.plugin, ihook->supported, target) != NULL; } -static struct _GtkWidget *eih_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im) +static GtkWidget *eih_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im) { struct _EImportHookImporter *ihook = (EImportHookImporter *)im; EImportHook *hook = im->user_data; diff --git a/e-util/e-import.h b/e-util/e-import.h index 4474db18da..84c5061132 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -24,14 +24,11 @@ #ifndef __E_IMPORT_H__ #define __E_IMPORT_H__ -#include <glib-object.h> -#include "libedataserver/e-msgport.h" +#include <gtk/gtk.h> +#include <libedataserver/e-msgport.h> G_BEGIN_DECLS -struct _GtkWindow; -struct _GtkWidget; - /* This is an importer function */ typedef struct _EImport EImport; @@ -47,7 +44,7 @@ typedef void (*EImportStatusFunc)(EImport *ei, const gchar *what, gint pc, gpoin typedef void (*EImportFactoryFunc)(EImport *ei, gpointer data); typedef void (*EImportImporterFunc)(EImportImporter *importer, gpointer data); typedef gboolean (*EImportSupportedFunc)(EImport *ei, EImportTarget *, EImportImporter *im); -typedef struct _GtkWidget *(*EImportWidgetFunc)(EImport *ei, EImportTarget *, EImportImporter *im); +typedef GtkWidget *(*EImportWidgetFunc)(EImport *ei, EImportTarget *, EImportImporter *im); typedef void (*EImportImportFunc)(EImport *ei, EImportTarget *, EImportImporter *im); /* The global target types, implementors may add additional ones */ @@ -180,7 +177,7 @@ EImport *e_import_construct(EImport *, const gchar *id); void e_import_import(EImport *ei, EImportTarget *, EImportImporter *, EImportStatusFunc status, EImportCompleteFunc done, gpointer data); void e_import_cancel(EImport *, EImportTarget *, EImportImporter *); -struct _GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImporter *); +GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImporter *); void e_import_status(EImport *, EImportTarget *, const gchar *what, gint pc); void e_import_complete(EImport *, EImportTarget *); diff --git a/e-util/e-menu.h b/e-util/e-menu.h index 7b8d6f5ce3..3b2416e46a 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -24,8 +24,8 @@ #ifndef __E_MENU_H__ #define __E_MENU_H__ -#include <glib-object.h> -#include "libedataserver/e-msgport.h" +#include <gtk/gtk.h> +#include <libedataserver/e-msgport.h> G_BEGIN_DECLS @@ -150,7 +150,7 @@ struct _EMenuUIFile { struct _EMenuTarget { struct _EMenu *menu; /* used for virtual methods */ - struct _GtkWidget *widget; /* used if you need a parent toplevel, if available */ + GtkWidget *widget; /* used if you need a parent toplevel, if available */ guint32 type; /* for implementors */ guint32 mask; /* enable/visible mask */ diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 6ca872b186..257234dc81 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -24,8 +24,8 @@ #ifndef __E_POPUP_H__ #define __E_POPUP_H__ -#include <glib-object.h> -#include "libedataserver/e-msgport.h" +#include <gtk/gtk.h> +#include <libedataserver/e-msgport.h> G_BEGIN_DECLS @@ -141,7 +141,7 @@ struct _EPopupItem { struct _EPopupTarget { struct _EPopup *popup; /* used for virtual methods */ - struct _GtkWidget *widget; /* used if you need a parent toplevel, if available */ + GtkWidget *widget; /* used if you need a parent toplevel, if available */ guint32 type; /* targe type, for implementors */ guint32 mask; /* depends on type, visibility mask */ @@ -207,8 +207,8 @@ void e_popup_add_items(EPopup *, GSList *items, const gchar *domain, EPopupItems void e_popup_add_static_items(EPopup *emp, EPopupTarget *target); /* do not call e_popup_create_menu, it can leak structures if not used right */ -struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask); -struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask); +GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask); +GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask); gpointer e_popup_target_new(EPopup *, gint type, gsize size); void e_popup_target_free(EPopup *, gpointer ); diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index 256bec218a..59d39f5a3a 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -31,9 +31,6 @@ G_BEGIN_DECLS -struct _CamelFolder; -struct _CamelMimeMessage; - typedef struct _EProfileEvent EProfileEvent; typedef struct _EProfileEventClass EProfileEventClass; diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index 16d67f11ef..f0f3ae3bfe 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -22,9 +22,7 @@ #define _E_UTIL_LABELS_H #include <gtk/gtk.h> - -struct _GtkWindow; -struct _GConfClient; +#include <gconf/gconf-client.h> typedef struct { gchar *tag; @@ -38,7 +36,7 @@ GSList * e_util_labels_parse (struct _GConfClient *client); void e_util_labels_free (GSList *labels); gchar * e_util_labels_add (const gchar *name, const GdkColor *color); -gchar * e_util_labels_add_with_dlg (struct _GtkWindow *parent, const gchar *tag); +gchar * e_util_labels_add_with_dlg (GtkWindow *parent, const gchar *tag); gboolean e_util_labels_remove (const gchar *tag); gboolean e_util_labels_set_data (const gchar *tag, const gchar *name, const GdkColor *color); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index a9d0fccd39..95b525a8a9 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -89,34 +89,34 @@ typedef struct _EMAccountEditorService { EMAccountEditor *emae; /* parent pointer, for callbacks */ /* NOTE: keep all widgets together, first frame last check_dialog */ - struct _GtkWidget *frame; - struct _GtkWidget *container; - - struct _GtkComboBox *providers; - - struct _GtkLabel *description; - struct _GtkLabel *hostlabel; - struct _GtkEntry *hostname; - struct _GtkLabel *userlabel; - struct _GtkEntry *username; - struct _GtkEntry *path; - struct _GtkLabel *pathlabel; - struct _GtkWidget *pathentry; - - struct _GtkWidget *ssl_frame; - struct _GtkComboBox *use_ssl; - struct _GtkWidget *ssl_hbox; - struct _GtkWidget *no_ssl; - - struct _GtkWidget *auth_frame; - struct _GtkComboBox *authtype; - - struct _GtkWidget *authitem; - struct _GtkToggleButton *remember; - struct _GtkButton *check_supported; - struct _GtkToggleButton *needs_auth; - - struct _GtkWidget *check_dialog; + GtkWidget *frame; + GtkWidget *container; + + GtkComboBox *providers; + + GtkLabel *description; + GtkLabel *hostlabel; + GtkEntry *hostname; + GtkLabel *userlabel; + GtkEntry *username; + GtkEntry *path; + GtkLabel *pathlabel; + GtkWidget *pathentry; + + GtkWidget *ssl_frame; + GtkComboBox *use_ssl; + GtkWidget *ssl_hbox; + GtkWidget *no_ssl; + + GtkWidget *auth_frame; + GtkComboBox *authtype; + + GtkWidget *authitem; + GtkToggleButton *remember; + GtkButton *check_supported; + GtkToggleButton *needs_auth; + + GtkWidget *check_dialog; gint check_id; GList *authtypes; /* if "Check supported" */ @@ -126,12 +126,12 @@ typedef struct _EMAccountEditorService { gint auth_changed_id; } EMAccountEditorService; -typedef struct _EMAccountEditorPrivate { +struct _EMAccountEditorPrivate { struct _EMConfig *config; GList *providers; /* signatures */ - struct _GtkComboBox *signatures_dropdown; + GtkComboBox *signatures_dropdown; guint sig_added_id; guint sig_removed_id; guint sig_changed_id; @@ -149,31 +149,31 @@ typedef struct _EMAccountEditorPrivate { /* account management */ GtkEntry *identity_entries[5]; - struct _GtkToggleButton *default_account; - struct _GtkWidget *management_frame; + GtkToggleButton *default_account; + GtkWidget *management_frame; /* special folders */ - struct _GtkButton *drafts_folder_button; - struct _GtkButton *sent_folder_button; - struct _GtkButton *restore_folders_button; + GtkButton *drafts_folder_button; + GtkButton *sent_folder_button; + GtkButton *restore_folders_button; /* Security */ - struct _GtkEntry *pgp_key; - struct _GtkToggleButton *pgp_encrypt_to_self; - struct _GtkToggleButton *pgp_always_sign; - struct _GtkToggleButton *pgp_no_imip_sign; - struct _GtkToggleButton *pgp_always_trust; - - struct _GtkToggleButton *smime_sign_default; - struct _GtkEntry *smime_sign_key; - struct _GtkButton *smime_sign_key_select; - struct _GtkButton *smime_sign_key_clear; - struct _GtkButton *smime_sign_select; - struct _GtkToggleButton *smime_encrypt_default; - struct _GtkToggleButton *smime_encrypt_to_self; - struct _GtkEntry *smime_encrypt_key; - struct _GtkButton *smime_encrypt_key_select; - struct _GtkButton *smime_encrypt_key_clear; + GtkEntry *pgp_key; + GtkToggleButton *pgp_encrypt_to_self; + GtkToggleButton *pgp_always_sign; + GtkToggleButton *pgp_no_imip_sign; + GtkToggleButton *pgp_always_trust; + + GtkToggleButton *smime_sign_default; + GtkEntry *smime_sign_key; + GtkButton *smime_sign_key_select; + GtkButton *smime_sign_key_clear; + GtkButton *smime_sign_select; + GtkToggleButton *smime_encrypt_default; + GtkToggleButton *smime_encrypt_to_self; + GtkEntry *smime_encrypt_key; + GtkButton *smime_encrypt_key_select; + GtkButton *smime_encrypt_key_clear; /* for e-config callbacks, each page sets up its widgets, then they are dealed out by the get_widget callback in order*/ GtkWidget *widgets[5]; @@ -185,7 +185,7 @@ typedef struct _EMAccountEditorPrivate { guint receive_set:1; guint send_set:1; guint management_set:1; -} EMAccountEditorPrivate; +}; static void emae_refresh_authtype(EMAccountEditor *emae, EMAccountEditorService *service); static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id); @@ -1789,7 +1789,7 @@ emae_queue_widgets(EMAccountEditor *emae, GladeXML *xml, const gchar *first, ... } static GtkWidget * -emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_identity_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; @@ -1862,7 +1862,7 @@ emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st } static GtkWidget * -emae_receive_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_receive_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; @@ -2157,7 +2157,7 @@ emae_option_options (EMAccountEditorService *service, CamelURL *url, const gchar } static GtkWidget * -emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_receive_options_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; GtkWidget *w, *box, *spin; @@ -2194,7 +2194,7 @@ emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *par } static GtkWidget * -emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; struct _receive_options_item *item = (struct _receive_options_item *)eitem; @@ -2328,7 +2328,7 @@ section: } static GtkWidget * -emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_send_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; @@ -2383,7 +2383,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct } static GtkWidget * -emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_defaults_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; @@ -2441,7 +2441,7 @@ emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st } static GtkWidget * -emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_security_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; #if defined (HAVE_NSS) @@ -2505,7 +2505,7 @@ emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st } static GtkWidget * -emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; gint i; @@ -2556,7 +2556,7 @@ static EMConfigItem emae_editor_items[] = { static gboolean emae_editor_items_translated = FALSE; static GtkWidget * -emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_management_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; @@ -2586,7 +2586,7 @@ emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, } static GtkWidget * -emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emae_widget_druid_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { GladeXML *druidxml; GtkWidget *w; diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 01d9dbd221..d8d96f58f0 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -26,12 +26,13 @@ #include <gtk/gtk.h> -G_BEGIN_DECLS +#include <mail/em-config.h> -struct _EAccount; +G_BEGIN_DECLS typedef struct _EMAccountEditor EMAccountEditor; typedef struct _EMAccountEditorClass EMAccountEditorClass; +typedef struct _EMAccountEditorPrivate EMAccountEditorPrivate; typedef enum { EMAE_NOTEBOOK, @@ -42,15 +43,15 @@ typedef enum { struct _EMAccountEditor { GObject gobject; - struct _EMAccountEditorPrivate *priv; + EMAccountEditorPrivate *priv; em_account_editor_t type; - struct _GtkWidget *editor; /* gtknotebook or druid, depending on type */ + GtkWidget *editor; /* gtknotebook or druid, depending on type */ - struct _EMConfig *config; /* driver object */ + EMConfig *config; /* driver object */ - struct _EAccount *account; /* working account, must instant apply to this */ - struct _EAccount *original; /* original account, not changed unless commit is invoked */ + EAccount *account; /* working account, must instant apply to this */ + EAccount *original; /* original account, not changed unless commit is invoked */ GtkWidget **pages; /* Pages for Anjal's page type editor */ @@ -63,18 +64,18 @@ struct _EMAccountEditorClass { GType em_account_editor_get_type(void); -EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const gchar *id); -EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, gchar *id, struct _GtkWidget **pages); +EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id); +EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_editor_t type, gchar *id, GtkWidget **pages); void em_account_editor_commit (EMAccountEditor *emae); void em_account_editor_check (EMAccountEditor *emae, const gchar *page); gboolean em_account_editor_save (EMAccountEditor *gui); void em_account_editor_destroy (EMAccountEditor *gui); -gboolean em_account_editor_identity_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -gboolean em_account_editor_source_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -gboolean em_account_editor_transport_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -gboolean em_account_editor_management_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); +gboolean em_account_editor_identity_complete (EMAccountEditor *gui, GtkWidget **incomplete); +gboolean em_account_editor_source_complete (EMAccountEditor *gui, GtkWidget **incomplete); +gboolean em_account_editor_transport_complete (EMAccountEditor *gui, GtkWidget **incomplete); +gboolean em_account_editor_management_complete (EMAccountEditor *gui, GtkWidget **incomplete); void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url); diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index 2e12c7ffb2..1ff850623d 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -24,6 +24,8 @@ #define __EM_COMPOSER_PREFS_H__ #include <gtk/gtk.h> +#include <glade/glade.h> +#include <gtkhtml/gtkhtml.h> /* Standard GObject macros */ #define EM_TYPE_COMPOSER_PREFS \ @@ -55,7 +57,7 @@ struct _GladeXML; struct _EMComposerPrefs { GtkVBox parent; - struct _GladeXML *gui; + GladeXML *gui; /* General tab */ @@ -76,9 +78,9 @@ struct _EMComposerPrefs { GtkButton *sig_add_script; GtkButton *sig_edit; GtkButton *sig_delete; - struct _GtkHTML *sig_preview; + GtkHTML *sig_preview; - struct _GladeXML *sig_script_gui; + GladeXML *sig_script_gui; GtkWidget *sig_script_dialog; guint sig_added_id; diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index 3ba3c5e23f..4c916529ec 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -25,50 +25,44 @@ #define __EM_COMPOSER_UTILS_H__ #include <glib.h> +#include <camel/camel-nntp-address.h> -G_BEGIN_DECLS +#include <mail/em-format.h> +#include <composer/e-msg-composer.h> -struct _CamelFolder; -struct _CamelMimeMessage; -struct _CamelException; -struct _CamelInternetAddress; -struct _CamelNNTPAddress; -struct _EMsgComposer; -struct _EMFormat; -struct _EAccount; -struct _EDestination; +G_BEGIN_DECLS -void em_composer_utils_setup_callbacks (struct _EMsgComposer *composer, struct _CamelFolder *folder, const gchar *uid, - guint32 flags, guint32 set, struct _CamelFolder *drafts, const gchar *drafts_uid); +void em_composer_utils_setup_callbacks (EMsgComposer *composer, CamelFolder *folder, const gchar *uid, + guint32 flags, guint32 set, CamelFolder *drafts, const gchar *drafts_uid); #define em_composer_utils_setup_default_callbacks(composer) em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL) -void em_utils_composer_send_cb(struct _EMsgComposer *composer, gpointer user_data); -void em_utils_composer_save_draft_cb(struct _EMsgComposer *composer, gpointer user_data); +void em_utils_composer_send_cb(EMsgComposer *composer, gpointer user_data); +void em_utils_composer_save_draft_cb(EMsgComposer *composer, gpointer user_data); void em_utils_compose_new_message (const gchar *fromuri); -struct _EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); +EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ -struct _EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); +EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); -void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder); -void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace); +void em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder); +void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace); -void em_utils_forward_attached (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_forward_inline (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_forward_quoted (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_inline (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_quoted (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_forward_message (struct _CamelMimeMessage *msg, const gchar *fromuri); -void em_utils_forward_messages (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_message (CamelMimeMessage *msg, const gchar *fromuri); +void em_utils_forward_messages (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_redirect_message (struct _CamelMimeMessage *message); -void em_utils_redirect_message_by_uid (struct _CamelFolder *folder, const gchar *uid); +void em_utils_redirect_message (CamelMimeMessage *message); +void em_utils_redirect_message_by_uid (CamelFolder *folder, const gchar *uid); -void em_utils_forward_message_raw (struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *address, struct _CamelException *ex); +void em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, const gchar *address, CamelException *ex); -void em_utils_handle_receipt (struct _CamelFolder *folder, const gchar *uid, struct _CamelMimeMessage *msg); -void em_utils_send_receipt (struct _CamelFolder *folder, struct _CamelMimeMessage *message); +void em_utils_handle_receipt (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg); +void em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message); enum { REPLY_MODE_SENDER, @@ -76,11 +70,11 @@ enum { REPLY_MODE_LIST }; -gchar *em_utils_construct_composer_text (struct _CamelMimeMessage *message, struct _EMFormat *source); -void em_utils_get_reply_sender (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelNNTPAddress *postto); -void em_utils_get_reply_all (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelInternetAddress *cc, struct _CamelNNTPAddress *postto); -struct _EMsgComposer * em_utils_reply_to_message (struct _CamelFolder *, const gchar *uid, struct _CamelMimeMessage *message, gint mode, struct _EMFormat *source); -struct _EDestination ** em_utils_camel_address_to_destination (struct _CamelInternetAddress *iaddr); +gchar *em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source); +void em_utils_get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto); +void em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInternetAddress *cc, CamelNNTPAddress *postto); +EMsgComposer * em_utils_reply_to_message (CamelFolder *, const gchar *uid, CamelMimeMessage *message, gint mode, EMFormat *source); +EDestination ** em_utils_camel_address_to_destination (CamelInternetAddress *iaddr); G_END_DECLS diff --git a/mail/em-config.c b/mail/em-config.c index 985a02d56c..a44554b800 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -190,7 +190,7 @@ EMConfig *em_config_new(gint type, const gchar *menuid) } EMConfigTargetFolder * -em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri) +em_config_target_new_folder(EMConfig *emp, CamelFolder *folder, const gchar *uri) { EMConfigTargetFolder *t = e_config_target_new(&emp->config, EM_CONFIG_TARGET_FOLDER, sizeof(*t)); diff --git a/mail/em-config.h b/mail/em-config.h index b2d3bde691..656a40ec38 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -24,15 +24,17 @@ #define __EM_CONFIG_H__ #include <glib-object.h> +#include <gconf/gconf-client.h> +#include <camel/camel-folder.h> +#include <libedataserver/e-account.h> #include "e-util/e-config.h" G_BEGIN_DECLS -struct _GConfClient; - typedef struct _EMConfig EMConfig; typedef struct _EMConfigClass EMConfigClass; +typedef struct _EMConfigPrivate EMConfigPrivate; /* Current target description */ /* Types of popup tagets */ @@ -49,7 +51,7 @@ typedef struct _EMConfigTargetAccount EMConfigTargetAccount; struct _EMConfigTargetFolder { EConfigTarget target; - struct _CamelFolder *folder; + CamelFolder *folder; gchar *uri; }; @@ -57,13 +59,13 @@ struct _EMConfigTargetPrefs { EConfigTarget target; /* preferences are global from gconf */ - struct _GConfClient *gconf; + GConfClient *gconf; }; struct _EMConfigTargetAccount { EConfigTarget target; - struct _EAccount *account; + EAccount *account; /* Need also: working account, not just real account, so changes can be propagated around And some mechamism for controlling the gui if we're running inside a druid, e.g. enabling 'next' */ }; @@ -74,7 +76,7 @@ typedef struct _EConfigItem EMConfigItem; struct _EMConfig { EConfig config; - struct _EMConfigPrivate *priv; + EMConfigPrivate *priv; }; struct _EMConfigClass { @@ -85,9 +87,9 @@ GType em_config_get_type(void); EMConfig *em_config_new(gint type, const gchar *menuid); -EMConfigTargetFolder *em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri); -EMConfigTargetPrefs *em_config_target_new_prefs(EMConfig *emp, struct _GConfClient *gconf); -EMConfigTargetAccount *em_config_target_new_account(EMConfig *emp, struct _EAccount *account); +EMConfigTargetFolder *em_config_target_new_folder(EMConfig *emp, CamelFolder *folder, const gchar *uri); +EMConfigTargetPrefs *em_config_target_new_prefs(EMConfig *emp, GConfClient *gconf); +EMConfigTargetAccount *em_config_target_new_account(EMConfig *emp, EAccount *account); /* ********************************************************************** */ diff --git a/mail/em-event.h b/mail/em-event.h index b58a0f2cfc..770daa72f2 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -27,15 +27,11 @@ #include <glib-object.h> #include "e-util/e-event.h" +#include "composer/e-msg-composer.h" #include "mail/em-folder-browser.h" G_BEGIN_DECLS -struct _CamelFolder; -struct _CamelMimeMessage; -struct _EMsgComposer; -struct _GtkWidget; - typedef struct _EMEvent EMEvent; typedef struct _EMEventClass EMEventClass; @@ -93,9 +89,9 @@ typedef struct _EMEventTargetMessage EMEventTargetMessage; struct _EMEventTargetMessage { EEventTarget target; - struct _CamelFolder *folder; + CamelFolder *folder; gchar *uid; - struct _CamelMimeMessage *message; + CamelMimeMessage *message; }; typedef struct _EMEventTargetComposer EMEventTargetComposer; @@ -103,7 +99,7 @@ typedef struct _EMEventTargetComposer EMEventTargetComposer; struct _EMEventTargetComposer { EEventTarget target; - struct _EMsgComposer *composer; + EMsgComposer *composer; }; typedef struct _EMEventTargetFolderBrowser EMEventTargetFolderBrowser; @@ -111,7 +107,7 @@ typedef struct _EMEventTargetFolderBrowser EMEventTargetFolderBrowser; struct _EMEventTargetFolderBrowser { EEventTarget target; - struct _EMFolderBrowser *emfb; + EMFolderBrowser *emfb; }; @@ -120,7 +116,7 @@ typedef struct _EMEventTargetSendReceive EMEventTargetSendReceive; struct _EMEventTargetSendReceive { EEventTarget target; - struct _GtkWidget *table; + GtkWidget *table; gpointer data; gint row; }; @@ -154,9 +150,9 @@ EMEvent *em_event_peek(void); EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const gchar *uri, guint32 flags); EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb); -EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags); -EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *uid, guint32 flags); -EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, gint row, guint32 flags); +EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const EMsgComposer *composer, guint32 flags); +EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags); +EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, gint row, guint32 flags); EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkTreeStore *store, GtkTreeIter *iter, const gchar *uri, guint32 flags); /* ********************************************************************** */ diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 429b409b54..709491a686 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -154,7 +154,7 @@ add_numbered_row (GtkTable *table, gint row, const gchar *description, const gch } static GtkWidget * -emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emfp_get_folder_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { GtkWidget *w, *table, *label; struct _prop_data *prop_data = data; diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h index d28eefe29b..958a5669c3 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -24,12 +24,12 @@ #ifndef __EM_FOLDER_PROPERTIES_H__ #define __EM_FOLDER_PROPERTIES_H__ -G_BEGIN_DECLS +#include <gtk/gtk.h> +#include <camel/camel-folder.h> -struct _CamelFolder; -struct _GtkWindow; +G_BEGIN_DECLS -void em_folder_properties_show(struct _GtkWindow *parent, struct _CamelFolder *folder, const gchar *uri); +void em_folder_properties_show(GtkWindow *parent, CamelFolder *folder, const gchar *uri); G_END_DECLS diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h index 8a15526a64..af3243fdd5 100644 --- a/mail/em-folder-selection.h +++ b/mail/em-folder-selection.h @@ -24,13 +24,12 @@ #ifndef EM_FOLDER_SELECTION_H #define EM_FOLDER_SELECTION_H -G_BEGIN_DECLS - +#include <gtk/gtk.h> #include "em-folder-tree.h" -struct _GtkWindow; +G_BEGIN_DECLS -void em_select_folder (struct _GtkWindow *parent_window, const gchar *title, const gchar *oklabel, const gchar *default_uri, +void em_select_folder (GtkWindow *parent_window, const gchar *title, const gchar *oklabel, const gchar *default_uri, EMFTExcludeFunc exclude, void (*done)(const gchar *uri, gpointer data), gpointer data); diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 5ac7152d61..f358fc059d 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -26,17 +26,14 @@ #include <gtk/gtk.h> -#ifdef cplusplus -extern "C" { -#pragma } -#endif /* cplusplus */ - #define EM_TYPE_FOLDER_SELECTOR (em_folder_selector_get_type ()) #define EM_FOLDER_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FOLDER_SELECTOR, EMFolderSelector)) #define EM_FOLDER_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EM_TYPE_FOLDER_SELECTOR, EMFolderSelectorClass)) #define EM_IS_FOLDER_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR)) #define EM_IS_FOLDER_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EM_TYPE_FOLDER_SELECTOR)) +G_BEGIN_DECLS + typedef struct _EMFolderSelector EMFolderSelector; typedef struct _EMFolderSelectorPrivate EMFolderSelectorPrivate; typedef struct _EMFolderSelectorClass EMFolderSelectorClass; @@ -47,7 +44,7 @@ struct _EMFolderSelector { guint32 flags; struct _EMFolderTree *emft; - struct _GtkEntry *name_entry; + GtkEntry *name_entry; gchar *selected_path; gchar *selected_uri; @@ -87,8 +84,6 @@ const gchar *em_folder_selector_get_selected_path (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_uris (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_paths (EMFolderSelector *emfs); -#ifdef cplusplus -} -#endif /* cplusplus */ +G_END_DECLS #endif /* EM_FOLDER_SELECTOR_H */ diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index aa977ad3e7..e9c5b35d1d 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -450,7 +450,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite GtkTreePath *path; GtkTreeIter sub; gboolean load = FALSE, is_drafts = FALSE, is_templates = FALSE; - struct _CamelFolder *folder; + CamelFolder *folder; gboolean emitted = FALSE; const gchar *name; const gchar *icon_name; diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index c9202dcfa3..bb25f390ea 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -24,7 +24,13 @@ #define EM_FOLDER_VIEW_H #include <gtk/gtk.h> +#include <bonobo/bonobo-ui-component.h> + +#include "mail/em-format-html-display.h" +#include "mail/em-menu.h" #include "mail/em-popup.h" +#include "mail/mail-mt.h" +#include "mail/message-list.h" /* Standard GObject macros */ #define EM_TYPE_FOLDER_VIEW \ @@ -47,11 +53,6 @@ G_BEGIN_DECLS -struct _MessageList; -struct _EMFormatHTMLDisplay; -struct _CamelFolder; -struct _CamelMedium; - typedef struct _EMFolderView EMFolderView; typedef struct _EMFolderViewClass EMFolderViewClass; @@ -80,11 +81,11 @@ struct _EMFolderView { struct _EMFolderViewPrivate *priv; - struct _MessageList *list; + MessageList *list; - struct _EMFormatHTMLDisplay *preview; + EMFormatHTMLDisplay *preview; - struct _CamelFolder *folder; + CamelFolder *folder; gchar *folder_uri; gchar *displayed_uid; /* only used to stop re-loads, don't use it to represent any selection state */ @@ -94,12 +95,12 @@ struct _EMFolderView { const gchar *ui_app_name; /* used to manage some menus, particularly plugins */ - struct _EMMenu *menu; + EMMenu *menu; /* for proxying jobs to main or other threads */ - struct _MailAsyncEvent *async; + MailAsyncEvent *async; - struct _BonoboUIComponent *uic; /* if we're active, this will be set */ + BonoboUIComponent *uic; /* if we're active, this will be set */ GSList *enable_map; /* bonobo menu enable map, entries are 0-terminated EMFolderViewEnable arryas TODO: should this be on class? */ @@ -118,10 +119,10 @@ struct _EMFolderViewClass { guint update_message_style:1; /* if used as a control, used to activate/deactivate custom menu's */ - void (*activate)(EMFolderView *, struct _BonoboUIComponent *uic, gint state); + void (*activate)(EMFolderView *, BonoboUIComponent *uic, gint state); void (*set_folder_uri)(EMFolderView *emfv, const gchar *uri); - void (*set_folder)(EMFolderView *emfv, struct _CamelFolder *folder, const gchar *uri); + void (*set_folder)(EMFolderView *emfv, CamelFolder *folder, const gchar *uri); void (*set_message)(EMFolderView *emfv, const gchar *uid, gint nomarkseen); void (*show_search_bar)(EMFolderView *emfv); diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index 61cc515684..dd61fd6520 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -64,7 +64,7 @@ static const EPluginHookTargetKey emfh_flag_map[] = { }; static void -emfh_format_format(EMFormat *md, struct _CamelStream *stream, struct _CamelMimePart *part, const EMFormatHandler *info) +emfh_format_format(EMFormat *md, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info) { struct _EMFormatHookItem *item = (EMFormatHookItem *)info; diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h index 3f02167e58..8312404451 100644 --- a/mail/em-format-hook.h +++ b/mail/em-format-hook.h @@ -43,8 +43,8 @@ typedef void (*EMFormatHookFunc)(struct _EPlugin *plugin, EMFormatHookTarget *da struct _EMFormatHookTarget { struct _EMFormat *format; - struct _CamelStream *stream; - struct _CamelMimePart *part; + CamelStream *stream; + CamelMimePart *part; struct _EMFormatHookItem *item; }; diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h index 16bafc30fb..d85809f0b0 100644 --- a/mail/em-format-html-display.h +++ b/mail/em-format-html-display.h @@ -74,7 +74,7 @@ struct _EMFormatHTMLDisplayClass { /* a link clicked normally */ void (*link_clicked)(EMFormatHTMLDisplay *efhd, const gchar *uri); /* a part or a link button pressed event */ - gint (*popup_event)(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, struct _CamelMimePart *part); + gint (*popup_event)(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, CamelMimePart *part); /* the mouse is over a link */ void (*on_url)(EMFormatHTMLDisplay *efhd, const gchar *uri); }; diff --git a/mail/em-format-html.c b/mail/em-format-html.c index c62bd3e569..76ab642c59 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -94,7 +94,7 @@ struct _EMFormatHTMLCache { }; struct _EMFormatHTMLPrivate { - struct _CamelMimeMessage *last_part; /* not reffed, DO NOT dereference */ + CamelMimeMessage *last_part; /* not reffed, DO NOT dereference */ volatile gint format_id; /* format thread id */ guint format_timeout_id; struct _format_msg *format_timeout_msg; diff --git a/mail/em-format.c b/mail/em-format.c index 99c71ec1e6..3c7c4cdc80 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -62,8 +62,8 @@ This is still kind of yucky, we should maintian a full tree of all this data, along with/as part of the puri tree */ struct _EMFormatCache { - struct _CamelCipherValidity *valid; /* validity copy */ - struct _CamelMimePart *secured; /* encrypted subpart */ + CamelCipherValidity *valid; /* validity copy */ + CamelMimePart *secured; /* encrypted subpart */ guint state:2; /* inline state */ @@ -822,7 +822,7 @@ em_format_redraw (EMFormat *emf) * encrypted messages viewed. **/ void -em_format_set_session(EMFormat *emf, struct _CamelSession *s) +em_format_set_session(EMFormat *emf, CamelSession *s) { if (s) camel_object_ref(s); @@ -1083,7 +1083,7 @@ void em_format_format_error(EMFormat *emf, CamelStream *stream, const gchar *fmt } void -em_format_format_secure(EMFormat *emf, struct _CamelStream *stream, struct _CamelMimePart *part, struct _CamelCipherValidity *valid) +em_format_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid) { ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_secure(emf, stream, part, valid); diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index 501a2b7bad..3f0177e7a4 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -147,7 +147,7 @@ emhs_sync_close(CamelStream *stream) } static void -emhs_gtkhtml_destroy(struct _GtkHTML *html, EMHTMLStream *emhs) +emhs_gtkhtml_destroy(GtkHTML *html, EMHTMLStream *emhs) { d(printf("%p: emhs gtkhtml destroy\n", emhs)); emhs->sync.cancel = TRUE; @@ -157,7 +157,7 @@ emhs_gtkhtml_destroy(struct _GtkHTML *html, EMHTMLStream *emhs) /* TODO: Could pass NULL for html_stream, and do a gtk_html_begin on first data -> less flashing */ CamelStream * -em_html_stream_new(struct _GtkHTML *html, struct _GtkHTMLStream *html_stream) +em_html_stream_new(GtkHTML *html, GtkHTMLStream *html_stream) { EMHTMLStream *new; diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h index 1f832fa046..20b781852d 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -31,17 +31,14 @@ G_BEGIN_DECLS #define EM_HTML_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_HTML_STREAM_TYPE, EMHTMLStreamClass)) #define EM_IS_HTML_STREAM(o) (CAMEL_CHECK_TYPE((o), EM_HTML_STREAM_TYPE)) -struct _GtkHTML; -struct _GtkHTMLStream; - #include "mail/em-sync-stream.h" typedef struct _EMHTMLStream { EMSyncStream sync; guint destroy_id; - struct _GtkHTML *html; - struct _GtkHTMLStream *html_stream; + GtkHTML *html; + GtkHTMLStream *html_stream; GtkHTMLBeginFlags flags; } EMHTMLStream; @@ -54,7 +51,7 @@ typedef struct { CamelType em_html_stream_get_type (void); /* the html_stream is closed when we are finalised (with an error), or closed (ok) */ -CamelStream *em_html_stream_new(struct _GtkHTML *html, struct _GtkHTMLStream *html_stream); +CamelStream *em_html_stream_new(GtkHTML *html, GtkHTMLStream *html_stream); void em_html_stream_set_flags (EMHTMLStream *emhs, GtkHTMLBeginFlags flags); G_END_DECLS diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 384d79846f..563853adcf 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -238,7 +238,7 @@ emis_sync_close(CamelStream *stream) } static void -emis_image_destroy(struct _GtkImage *image, EMIconStream *emis) +emis_image_destroy(GtkImage *image, EMIconStream *emis) { emis_cleanup(emis); } diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h index 17d4246059..a06b30d4de 100644 --- a/mail/em-icon-stream.h +++ b/mail/em-icon-stream.h @@ -23,17 +23,14 @@ #ifndef EM_ICON_STREAM_H #define EM_ICON_STREAM_H -G_BEGIN_DECLS +#include "mail/em-sync-stream.h" #define EM_ICON_STREAM_TYPE (em_icon_stream_get_type ()) #define EM_ICON_STREAM(obj) (CAMEL_CHECK_CAST((obj), EM_ICON_STREAM_TYPE, EMIconStream)) #define EM_ICON_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_ICON_STREAM_TYPE, EMIconStreamClass)) #define EM_IS_ICON_STREAM(o) (CAMEL_CHECK_TYPE((o), EM_ICON_STREAM_TYPE)) -struct _GtkHTML; -struct _GtkIconStream; - -#include "mail/em-sync-stream.h" +G_BEGIN_DECLS typedef struct _EMIconStream { EMSyncStream sync; @@ -41,7 +38,7 @@ typedef struct _EMIconStream { guint width, height; guint destroy_id; struct _GdkPixbufLoader *loader; - struct _GtkImage *image; + GtkImage *image; gchar *key; guint keep:1; diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h index b0af215e22..ac1779f8f0 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -26,6 +26,7 @@ #include <camel/camel-mime-filter.h> #include <camel/camel-mime-utils.h> +#include <camel/camel-multipart.h> #define EM_INLINE_FILTER_TYPE (em_inline_filter_get_type ()) #define EM_INLINE_FILTER(obj) (CAMEL_CHECK_CAST((obj), EM_INLINE_FILTER_TYPE, EMInlineFilter)) @@ -53,7 +54,7 @@ typedef struct _EMInlineFilterClass { CamelType em_inline_filter_get_type(void); EMInlineFilter *em_inline_filter_new(CamelTransferEncoding base_encoding, CamelContentType *type); -struct _CamelMultipart *em_inline_filter_get_multipart(EMInlineFilter *emif); +CamelMultipart *em_inline_filter_get_multipart(EMInlineFilter *emif); G_END_DECLS diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h index 1f66518e96..39d18421ef 100644 --- a/mail/em-junk-hook.h +++ b/mail/em-junk-hook.h @@ -27,6 +27,7 @@ #include "e-util/e-plugin.h" #include <camel/camel-junk-plugin.h> +#include <camel/camel-mime-message.h> G_BEGIN_DECLS @@ -46,7 +47,7 @@ GQuark em_junk_error_quark (void); #define EM_JUNK_ERROR em_junk_error_quark () struct _EMJunkHookTarget { - struct _CamelMimeMessage *m; + CamelMimeMessage *m; GError *error; }; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 12b2996b70..a76af74b1c 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -1011,7 +1011,7 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) static GtkWidget * -emmp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMMailerPrefs *prefs = data; diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index c556951bea..f9f36662ff 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -25,20 +25,8 @@ #include <gtk/gtk.h> #include <shell/Evolution.h> - -struct _ESignature; -struct _GtkToggleButton; -struct _GtkOptionMenu; -struct _GtkComboBox; -struct _GdkPixbuf; -struct _GtkWidget; -struct _GladeXML; -struct _GtkFileChooserbutton; -struct _GtkFontButton; -struct _GConfClient; -struct _GtkButton; -struct _GtkTreeView; -struct _GtkWindow; +#include <gconf/gconf-client.h> +#include <e-util/e-signature.h> #define EM_MAILER_PREFS_TYPE (em_mailer_prefs_get_type ()) #define EM_MAILER_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_MAILER_PREFS_TYPE, EMMailerPrefs)) @@ -69,70 +57,70 @@ struct _EMMailerPrefs { /* General tab */ /* Message Display */ - struct _GtkToggleButton *timeout_toggle; - struct _GtkSpinButton *timeout; - struct _GtkToggleButton *address_toggle; - struct _GtkSpinButton *address_count; - struct _GtkToggleButton *mlimit_toggle; - struct _GtkSpinButton *mlimit_count; - struct _GtkOptionMenu *charset; - struct _GtkToggleButton *citation_highlight; - struct _GtkColorButton *citation_color; - struct _GtkToggleButton *enable_search_folders; - struct _GtkToggleButton *magic_spacebar; + GtkToggleButton *timeout_toggle; + GtkSpinButton *timeout; + GtkToggleButton *address_toggle; + GtkSpinButton *address_count; + GtkToggleButton *mlimit_toggle; + GtkSpinButton *mlimit_count; + GtkOptionMenu *charset; + GtkToggleButton *citation_highlight; + GtkColorButton *citation_color; + GtkToggleButton *enable_search_folders; + GtkToggleButton *magic_spacebar; /* Deleting Mail */ - struct _GtkToggleButton *empty_trash; - struct _GtkComboBox *empty_trash_days; - struct _GtkToggleButton *confirm_expunge; + GtkToggleButton *empty_trash; + GtkComboBox *empty_trash_days; + GtkToggleButton *confirm_expunge; /* HTML Mail tab */ - struct _GtkFontButton *font_variable; - struct _GtkFontButton *font_fixed; - struct _GtkToggleButton *font_share; + GtkFontButton *font_variable; + GtkFontButton *font_fixed; + GtkToggleButton *font_share; /* Loading Images */ - struct _GtkToggleButton *images_always; - struct _GtkToggleButton *images_sometimes; - struct _GtkToggleButton *images_never; + GtkToggleButton *images_always; + GtkToggleButton *images_sometimes; + GtkToggleButton *images_never; - struct _GtkToggleButton *show_animated; - struct _GtkToggleButton *autodetect_links; - struct _GtkToggleButton *prompt_unwanted_html; + GtkToggleButton *show_animated; + GtkToggleButton *autodetect_links; + GtkToggleButton *prompt_unwanted_html; /* Labels and Colours tab */ - struct _GtkWidget *label_add; - struct _GtkWidget *label_edit; - struct _GtkWidget *label_remove; - struct _GtkWidget *label_tree; + GtkWidget *label_add; + GtkWidget *label_edit; + GtkWidget *label_remove; + GtkWidget *label_tree; guint labels_change_notify_id; /* mail_config's notify id */ /* Headers tab */ - struct _GtkButton *add_header; - struct _GtkButton *remove_header; - struct _GtkEntry *entry_header; - struct _GtkTreeView *header_list; - struct _GtkListStore *header_list_store; - struct _GtkToggleButton *photo_show; - struct _GtkToggleButton *photo_local; + GtkButton *add_header; + GtkButton *remove_header; + GtkEntry *entry_header; + GtkTreeView *header_list; + GtkListStore *header_list_store; + GtkToggleButton *photo_show; + GtkToggleButton *photo_local; /* Junk prefs */ - struct _GtkToggleButton *check_incoming; - struct _GtkToggleButton *empty_junk; - struct _GtkComboBox *empty_junk_days; - - struct _GtkToggleButton *sa_local_tests_only; - struct _GtkToggleButton *sa_use_daemon; - struct _GtkComboBox *default_junk_plugin; - struct _GtkLabel *plugin_status; - struct _GtkImage *plugin_image; - - struct _GtkToggleButton *junk_header_check; - struct _GtkTreeView *junk_header_tree; - struct _GtkButton *junk_header_add; - struct _GtkButton *junk_header_remove; - struct _GtkToggleButton *junk_book_lookup; - struct _GtkToggleButton *junk_lookup_local_only; + GtkToggleButton *check_incoming; + GtkToggleButton *empty_junk; + GtkComboBox *empty_junk_days; + + GtkToggleButton *sa_local_tests_only; + GtkToggleButton *sa_use_daemon; + GtkComboBox *default_junk_plugin; + GtkLabel *plugin_status; + GtkImage *plugin_image; + + GtkToggleButton *junk_header_check; + GtkTreeView *junk_header_tree; + GtkButton *junk_header_add; + GtkButton *junk_header_remove; + GtkToggleButton *junk_book_lookup; + GtkToggleButton *junk_lookup_local_only; }; struct _EMMailerPrefsClass { @@ -145,7 +133,7 @@ struct _EMMailerPrefsClass { GType em_mailer_prefs_get_type (void); GtkWidget * create_combo_text_widget (void); -struct _GtkWidget *em_mailer_prefs_new (void); +GtkWidget *em_mailer_prefs_new (void); EMMailerPrefsHeader *em_mailer_prefs_header_from_xml(const gchar *xml); gchar *em_mailer_prefs_header_to_xml(EMMailerPrefsHeader *header); diff --git a/mail/em-menu.c b/mail/em-menu.c index f0da9c8820..bb8063e7dc 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -134,7 +134,7 @@ EMMenu *em_menu_new(const gchar *menuid) * Return value: **/ EMMenuTargetSelect * -em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids) +em_menu_target_new_select(EMMenu *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids) { EMMenuTargetSelect *t = e_menu_target_new(&emp->popup, EM_MENU_TARGET_SELECT, sizeof(*t)); guint32 mask = ~0; @@ -231,7 +231,7 @@ em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar * Return value: **/ EMMenuTargetWidget * -em_menu_target_new_widget(EMMenu *emp, struct _GtkWidget *w) +em_menu_target_new_widget(EMMenu *emp, GtkWidget *w) { EMMenuTargetWidget *t = e_menu_target_new(&emp->popup, EM_MENU_TARGET_WIDGET, sizeof(*t)); guint32 mask = ~0; diff --git a/mail/em-menu.h b/mail/em-menu.h index 3e7ca19aed..b2e66916e3 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -25,6 +25,7 @@ #define __EM_MENU_H__ #include <glib-object.h> +#include <camel/camel-folder.h> #include "e-util/e-menu.h" @@ -69,7 +70,7 @@ typedef struct _EMMenuTargetSelect EMMenuTargetSelect; struct _EMMenuTargetSelect { EMenuTarget target; - struct _CamelFolder *folder; + CamelFolder *folder; gchar *uri; GPtrArray *uids; }; @@ -97,8 +98,8 @@ GType em_menu_get_type(void); EMMenu *em_menu_new(const gchar *menuid); -EMMenuTargetSelect *em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); -EMMenuTargetWidget *em_menu_target_new_widget(EMMenu *emp, struct _GtkWidget *w); +EMMenuTargetSelect *em_menu_target_new_select(EMMenu *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); +EMMenuTargetWidget *em_menu_target_new_widget(EMMenu *emp, GtkWidget *w); /* ********************************************************************** */ diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 47df87a062..235994aadd 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -161,7 +161,7 @@ toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const gchar } static GtkWidget * -emnp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +emnp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { EMNetworkPrefs *prefs = data; diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 79b22c5a92..71031fbe35 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -24,6 +24,8 @@ #define __EM_NETWORK_PREFS_H__ #include <gtk/gtk.h> +#include <glade/glade.h> +#include <gconf/gconf-client.h> #define EM_NETWORK_PREFS_TYPE (em_network_prefs_get_type ()) #define EM_NETWORK_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_NETWORK_PREFS_TYPE, EMNetworkPrefs)) @@ -36,11 +38,6 @@ G_BEGIN_DECLS typedef struct _EMNetworkPrefs EMNetworkPrefs; typedef struct _EMNetworkPrefsClass EMNetworkPrefsClass; -struct _GtkToggleButton; -struct _GtkEntry; -struct _GladeXML; -struct _GConfClient; - typedef enum { NETWORK_PROXY_SYS_SETTINGS, NETWORK_PROXY_DIRECT_CONNECTION, @@ -52,43 +49,43 @@ typedef enum { struct _EMNetworkPrefs { GtkVBox parent_object; - struct _GConfClient *gconf; + GConfClient *gconf; - struct _GladeXML *gui; + GladeXML *gui; /* Default Behavior */ - struct _GtkToggleButton *sys_proxy; - struct _GtkToggleButton *no_proxy; - struct _GtkToggleButton *manual_proxy; + GtkToggleButton *sys_proxy; + GtkToggleButton *no_proxy; + GtkToggleButton *manual_proxy; #if 0 - struct _GtkToggleButton *auto_proxy; + GtkToggleButton *auto_proxy; #endif - struct _GtkToggleButton *use_auth; + GtkToggleButton *use_auth; - struct _GtkEntry *http_host; - struct _GtkEntry *https_host; - struct _GtkEntry *ignore_hosts; + GtkEntry *http_host; + GtkEntry *https_host; + GtkEntry *ignore_hosts; #if 0 - struct _GtkEntry *auto_proxy_url; + GtkEntry *auto_proxy_url; #endif - struct _GtkEntry *auth_user; - struct _GtkEntry *auth_pwd; - - struct _GtkLabel *lbl_http_host; - struct _GtkLabel *lbl_http_port; - struct _GtkLabel *lbl_https_host; - struct _GtkLabel *lbl_https_port; - struct _GtkLabel *lbl_ignore_hosts; - struct _GtkLabel *lbl_auth_user; - struct _GtkLabel *lbl_auth_pwd; - - struct _GtkSpinButton *http_port; - struct _GtkSpinButton *https_port; + GtkEntry *auth_user; + GtkEntry *auth_pwd; + + GtkLabel *lbl_http_host; + GtkLabel *lbl_http_port; + GtkLabel *lbl_https_host; + GtkLabel *lbl_https_port; + GtkLabel *lbl_ignore_hosts; + GtkLabel *lbl_auth_user; + GtkLabel *lbl_auth_pwd; + + GtkSpinButton *http_port; + GtkSpinButton *https_port; #if 0 - struct _GtkLabel *lbl_socks_host; - struct _GtkEntry *socks_host; - struct _GtkLabel *lbl_socks_port; - struct _GtkSpinButton *socks_port; + GtkLabel *lbl_socks_host; + GtkEntry *socks_host; + GtkLabel *lbl_socks_port; + GtkSpinButton *socks_port; #endif }; @@ -101,7 +98,7 @@ struct _EMNetworkPrefsClass { GType em_network_prefs_get_type (void); -struct _GtkWidget *em_network_prefs_new (void); +GtkWidget *em_network_prefs_new (void); /* needed by global config */ #define EM_NETWORK_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_NetworkPrefs_ConfigControl:" BASE_VERSION diff --git a/mail/em-popup.c b/mail/em-popup.c index 5caabca171..4f6b7ededf 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -155,7 +155,7 @@ EMPopup *em_popup_new(const gchar *menuid) * Return value: **/ EMPopupTargetSelect * -em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids) +em_popup_target_new_select(EMPopup *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids) { EMPopupTargetSelect *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_SELECT, sizeof(*t)); CamelStore *store = CAMEL_STORE (folder->parent_store); @@ -273,7 +273,7 @@ em_popup_target_new_uri(EMPopup *emp, const gchar *uri) } EMPopupTargetPart * -em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const gchar *mime_type) +em_popup_target_new_part(EMPopup *emp, CamelMimePart *part, const gchar *mime_type) { EMPopupTargetPart *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_PART, sizeof(*t)); guint32 mask = ~0; diff --git a/mail/em-popup.h b/mail/em-popup.h index cdac00becc..f7182e9358 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -25,6 +25,7 @@ #define __EM_POPUP_H__ #include <glib-object.h> +#include <camel/camel-folder.h> #include "e-util/e-popup.h" @@ -183,7 +184,7 @@ struct _EMPopupTargetURI { **/ struct _EMPopupTargetSelect { EPopupTarget target; - struct _CamelFolder *folder; + CamelFolder *folder; gchar *uri; GPtrArray *uids; }; @@ -202,7 +203,7 @@ struct _EMPopupTargetSelect { struct _EMPopupTargetPart { EPopupTarget target; gchar *mime_type; - struct _CamelMimePart *part; + CamelMimePart *part; }; /** @@ -236,8 +237,8 @@ GType em_popup_get_type(void); EMPopup *em_popup_new(const gchar *menuid); EMPopupTargetURI *em_popup_target_new_uri(EMPopup *emp, const gchar *uri); -EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); -EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const gchar *mime_type); +EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); +EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, CamelMimePart *part, const gchar *mime_type); EMPopupTargetFolder *em_popup_target_new_folder(EMPopup *emp, const gchar *uri, guint32 info_flags, guint32 popup_flags); /* ********************************************************************** */ diff --git a/mail/em-utils.c b/mail/em-utils.c index 207c96718a..1e285bc351 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -84,7 +84,7 @@ static void emu_save_part_done (CamelMimePart *part, gchar *name, gint done, gpointer data); -extern struct _CamelSession *session; +extern CamelSession *session; #define d(x) @@ -681,7 +681,7 @@ emu_add_address_cb(BonoboListener *listener, const gchar *name, const CORBA_any /* one of email or vcard should be always NULL, never both of them */ static void -emu_add_address_or_vcard (struct _GtkWidget *parent, const gchar *email, const gchar *vcard) +emu_add_address_or_vcard (GtkWidget *parent, const gchar *email, const gchar *vcard) { GtkWidget *win; GtkWidget *control; @@ -742,7 +742,7 @@ emu_add_address_or_vcard (struct _GtkWidget *parent, const gchar *email, const g * Add address @email to the addressbook. **/ void -em_utils_add_address (struct _GtkWidget *parent, const gchar *email) +em_utils_add_address (GtkWidget *parent, const gchar *email) { emu_add_address_or_vcard (parent, email, NULL); } @@ -752,7 +752,7 @@ em_utils_add_address (struct _GtkWidget *parent, const gchar *email) * Adds whole vCard to the addressbook. **/ void -em_utils_add_vcard (struct _GtkWidget *parent, const gchar *vcard) +em_utils_add_vcard (GtkWidget *parent, const gchar *vcard) { emu_add_address_or_vcard (parent, NULL, vcard); } @@ -2191,8 +2191,8 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only) return found; } -struct _CamelMimePart * -em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local) +CamelMimePart * +em_utils_contact_photo (CamelInternetAddress *cia, gboolean local) { const gchar *addr; gint stop = FALSE, found = FALSE; diff --git a/mail/em-utils.h b/mail/em-utils.h index 523d350b51..22b47b5be2 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -23,76 +23,65 @@ #ifndef __EM_UTILS_H__ #define __EM_UTILS_H__ -#include <glib.h> - -G_BEGIN_DECLS - +#include <gtk/gtk.h> #include <sys/types.h> -struct _GtkWidget; -struct _GtkWindow; -struct _CamelFolder; -struct _CamelInternetAddress; -struct _CamelStream; -struct _CamelMimeMessage; -struct _CamelMimePart; -struct _GtkSelectionData; -struct _GtkAdjustment; -struct _CamelException; -struct _EMFormat; +#include <mail/em-format.h> + +G_BEGIN_DECLS -gboolean em_utils_prompt_user(struct _GtkWindow *parent, const gchar *promptkey, const gchar *tag, const gchar *arg0, ...); +gboolean em_utils_prompt_user(GtkWindow *parent, const gchar *promptkey, const gchar *tag, const gchar *arg0, ...); GPtrArray *em_utils_uids_copy (GPtrArray *uids); void em_utils_uids_free (GPtrArray *uids); -gboolean em_utils_configure_account (struct _GtkWidget *parent); -gboolean em_utils_check_user_can_send_mail (struct _GtkWidget *parent); +gboolean em_utils_configure_account (GtkWidget *parent); +gboolean em_utils_check_user_can_send_mail (GtkWidget *parent); -void em_utils_edit_filters (struct _GtkWidget *parent); +void em_utils_edit_filters (GtkWidget *parent); void em_filename_make_safe (gchar *string); -void em_utils_edit_vfolders (struct _GtkWidget *parent); +void em_utils_edit_vfolders (GtkWidget *parent); -void em_utils_save_part(struct _GtkWidget *parent, const gchar *prompt, struct _CamelMimePart *part); -gboolean em_utils_save_part_to_file(struct _GtkWidget *parent, const gchar *filename, struct _CamelMimePart *part); -void em_utils_save_messages (struct _GtkWidget *parent, struct _CamelFolder *folder, GPtrArray *uids); +void em_utils_save_part(GtkWidget *parent, const gchar *prompt, CamelMimePart *part); +gboolean em_utils_save_part_to_file(GtkWidget *parent, const gchar *filename, CamelMimePart *part); +void em_utils_save_messages (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids); -void em_utils_add_address(struct _GtkWidget *parent, const gchar *email); -void em_utils_add_vcard(struct _GtkWidget *parent, const gchar *vcard); +void em_utils_add_address(GtkWidget *parent, const gchar *email); +void em_utils_add_vcard(GtkWidget *parent, const gchar *vcard); -void em_utils_flag_for_followup (struct _GtkWidget *parent, struct _CamelFolder *folder, GPtrArray *uids); -void em_utils_flag_for_followup_clear (struct _GtkWidget *parent, struct _CamelFolder *folder, GPtrArray *uids); -void em_utils_flag_for_followup_completed (struct _GtkWidget *parent, struct _CamelFolder *folder, GPtrArray *uids); +void em_utils_flag_for_followup (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids); +void em_utils_flag_for_followup_clear (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids); +void em_utils_flag_for_followup_completed (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids); /* This stuff that follows probably doesn't belong here, then again, the stuff above probably belongs elsewhere */ -void em_utils_selection_set_mailbox(struct _GtkSelectionData *data, struct _CamelFolder *folder, GPtrArray *uids); -void em_utils_selection_get_mailbox(struct _GtkSelectionData *data, struct _CamelFolder *folder); -void em_utils_selection_get_message(struct _GtkSelectionData *data, struct _CamelFolder *folder); -/* FIXME: be nice if these also worked on struct _CamelFolder's, no easy way to get uri from folder yet tho */ -void em_utils_selection_set_uidlist(struct _GtkSelectionData *data, const gchar *uri, GPtrArray *uids); -void em_utils_selection_get_uidlist(struct _GtkSelectionData *data, struct _CamelFolder *dest, gint move, struct _CamelException *ex); -void em_utils_selection_set_urilist(struct _GtkSelectionData *data, struct _CamelFolder *folder, GPtrArray *uids); -void em_utils_selection_get_urilist(struct _GtkSelectionData *data, struct _CamelFolder *folder); +void em_utils_selection_set_mailbox(GtkSelectionData *data, CamelFolder *folder, GPtrArray *uids); +void em_utils_selection_get_mailbox(GtkSelectionData *data, CamelFolder *folder); +void em_utils_selection_get_message(GtkSelectionData *data, CamelFolder *folder); +/* FIXME: be nice if these also worked on CamelFolder's, no easy way to get uri from folder yet tho */ +void em_utils_selection_set_uidlist(GtkSelectionData *data, const gchar *uri, GPtrArray *uids); +void em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, gint move, CamelException *ex); +void em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtrArray *uids); +void em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder); -gchar *em_utils_temp_save_part(struct _GtkWidget *parent, struct _CamelMimePart *part, gboolean mode); -void em_utils_save_parts (struct _GtkWidget *parent, const gchar *prompt, GSList * parts); +gchar *em_utils_temp_save_part(GtkWidget *parent, CamelMimePart *part, gboolean mode); +void em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList * parts); -gboolean em_utils_folder_is_drafts(struct _CamelFolder *folder, const gchar *uri); -gboolean em_utils_folder_is_templates(struct _CamelFolder *folder, const gchar *uri); -gboolean em_utils_folder_is_sent(struct _CamelFolder *folder, const gchar *uri); -gboolean em_utils_folder_is_outbox(struct _CamelFolder *folder, const gchar *uri); +gboolean em_utils_folder_is_drafts(CamelFolder *folder, const gchar *uri); +gboolean em_utils_folder_is_templates(CamelFolder *folder, const gchar *uri); +gboolean em_utils_folder_is_sent(CamelFolder *folder, const gchar *uri); +gboolean em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri); -void em_utils_adjustment_page(struct _GtkAdjustment *adj, gboolean down); +void em_utils_adjustment_page(GtkAdjustment *adj, gboolean down); gchar *em_utils_get_proxy_uri (const gchar *uri); /* FIXME: should this have an override charset? */ -gchar *em_utils_part_to_html(struct _CamelMimePart *part, gssize *len, struct _EMFormat *source); -gchar *em_utils_message_to_html(struct _CamelMimeMessage *msg, const gchar *credits, guint32 flags, gssize *len, struct _EMFormat *source, const gchar *append); +gchar *em_utils_part_to_html(CamelMimePart *part, gssize *len, EMFormat *source); +gchar *em_utils_message_to_html(CamelMimeMessage *msg, const gchar *credits, guint32 flags, gssize *len, EMFormat *source, const gchar *append); -void em_utils_expunge_folder (struct _GtkWidget *parent, struct _CamelFolder *folder); -void em_utils_empty_trash (struct _GtkWidget *parent); +void em_utils_expunge_folder (GtkWidget *parent, CamelFolder *folder); +void em_utils_empty_trash (GtkWidget *parent); /* returns the folder name portion of an URI */ gchar *em_utils_folder_name_from_uri (const gchar *uri); @@ -102,14 +91,14 @@ gchar *em_uri_from_camel (const gchar *curi); gchar *em_uri_to_camel (const gchar *euri); /* Run errors silently on the status bar */ -void em_utils_show_error_silent (struct _GtkWidget *widget); -void em_utils_show_info_silent (struct _GtkWidget *widget); +void em_utils_show_error_silent (GtkWidget *widget); +void em_utils_show_info_silent (GtkWidget *widget); /* is this address in the addressbook? caches results */ -gboolean em_utils_in_addressbook (struct _CamelInternetAddress *addr, gboolean local_only); -struct _CamelMimePart *em_utils_contact_photo (struct _CamelInternetAddress *addr, gboolean local); +gboolean em_utils_in_addressbook (CamelInternetAddress *addr, gboolean local_only); +CamelMimePart *em_utils_contact_photo (CamelInternetAddress *addr, gboolean local); -const gchar *em_utils_snoop_type(struct _CamelMimePart *part); +const gchar *em_utils_snoop_type(CamelMimePart *part); /* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */ void em_utils_clear_get_password_canceled_accounts_flag (void); diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 4faee016da..197415b4ee 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -9,6 +9,7 @@ privsolib_LTLIBRARIES = libevolution-mail-importers.la INCLUDES = -I.. \ -I$(srcdir)/.. \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(IMPORTERS_CFLAGS) diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 92f555cf75..7759a4e4e7 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -24,10 +24,15 @@ #ifndef __MAIL_IMPORTER_H__ #define __MAIL_IMPORTER_H__ +#include <bonobo/bonobo-generic-factory.h> +#include <camel/camel-folder.h> + +#include <e-util/e-import.h> + typedef struct _MailImporter MailImporter; struct _MailImporter { - struct _CamelFolder *folder; - struct _CamelStreamMem *mstream; + CamelFolder *folder; + CamelStreamMem *mstream; gboolean frozen; /* Is folder frozen? */ }; @@ -47,15 +52,10 @@ void mail_importer_create_folder (const gchar *parent_path, /* creates a folder at folderpath on the local storage */ gchar *mail_importer_make_local_folder(const gchar *folderpath); -struct _BonoboObject; -struct _BonoboGenericFactory; -struct _CamelOperation; -struct _CamelException; - -struct _EImportImporter *mbox_importer_peek(void); +EImportImporter *mbox_importer_peek(void); -struct _EImportImporter *elm_importer_peek(void); -struct _EImportImporter *pine_importer_peek(void); +EImportImporter *elm_importer_peek(void); +EImportImporter *pine_importer_peek(void); #define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer:" BASE_VERSION #define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer:" BASE_VERSION @@ -64,14 +64,14 @@ struct _EImportImporter *pine_importer_peek(void); #define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION #define OUTLOOK_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Outlook_Importer:" BASE_VERSION -struct _BonoboObject *elm_intelligent_importer_new(void); -struct _BonoboObject *pine_intelligent_importer_new(void); -struct _BonoboObject *netscape_intelligent_importer_new(void); +BonoboObject *elm_intelligent_importer_new(void); +BonoboObject *pine_intelligent_importer_new(void); +BonoboObject *netscape_intelligent_importer_new(void); -struct _BonoboObject *mbox_importer_new(void); -struct _BonoboObject *outlook_importer_new(void); +BonoboObject *mbox_importer_new(void); +BonoboObject *outlook_importer_new(void); -struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const gchar *iid, gpointer data); +BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data); /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */ @@ -81,8 +81,8 @@ struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *fac #define MSG_FLAG_MARKED 0x0004 #define MSG_FLAG_EXPUNGED 0x0008 -gint mail_importer_import_mbox(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel, void (*done)(gpointer data, struct _CamelException *), gpointer data); -void mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel); +gint mail_importer_import_mbox(const gchar *path, const gchar *folderuri, CamelOperation *cancel, void (*done)(gpointer data, CamelException *), gpointer data); +void mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, CamelOperation *cancel); struct _MailImporterSpecial { const gchar *orig, *new; @@ -93,6 +93,6 @@ typedef struct _MailImporterSpecial MailImporterSpecial; #define MAIL_IMPORTER_MOZFMT (1<<0) /* api in flux */ -void mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, struct _CamelOperation *cancel); +void mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, CamelOperation *cancel); #endif diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index 67ff5d6310..8ad98589ef 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -24,12 +24,11 @@ #ifndef _MAIL_AUTOFILTER_H #define _MAIL_AUTOFILTER_H -struct _FilterRule; -struct _EMVFolderContext; -struct _EMFilterContext; -struct _CamelMimeMessage; -struct _CamelInternetAddress; -struct _CamelStore; +#include <camel/camel-mime-message.h> + +#include <filter/filter-rule.h> +#include <mail/em-filter-context.h> +#include <mail/em-vfolder-context.h> enum { AUTO_SUBJECT = 1, @@ -38,15 +37,15 @@ enum { AUTO_MLIST = 8 }; -struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, gint flags, const gchar *source); -struct _FilterRule *filter_rule_from_message(struct _EMFilterContext *context, struct _CamelMimeMessage *msg, gint flags); -struct _FilterRule *em_vfolder_rule_from_address(struct _EMVFolderContext *context, struct _CamelInternetAddress *addr, gint flags, const gchar *source); +FilterRule *em_vfolder_rule_from_message(EMVFolderContext *context, CamelMimeMessage *msg, gint flags, const gchar *source); +FilterRule *filter_rule_from_message(EMFilterContext *context, CamelMimeMessage *msg, gint flags); +FilterRule *em_vfolder_rule_from_address(EMVFolderContext *context, CamelInternetAddress *addr, gint flags, const gchar *source); /* easiest place to put this */ -void filter_gui_add_from_message(struct _CamelMimeMessage *msg, const gchar *source, gint flags); +void filter_gui_add_from_message(CamelMimeMessage *msg, const gchar *source, gint flags); /* Also easiest place for these, we should really share a global rule context for this stuff ... */ -void mail_filter_rename_uri(struct _CamelStore *store, const gchar *olduri, const gchar *newuri); -void mail_filter_delete_uri(struct _CamelStore *store, const gchar *uri); +void mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newuri); +void mail_filter_delete_uri(CamelStore *store, const gchar *uri); #endif diff --git a/mail/mail-component.c b/mail/mail-component.c index 8d72fb590c..4b788b3178 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -1359,7 +1359,7 @@ mail_component_peek_activity_handler (MailComponent *component) return component->priv->activity_handler; } -struct _CamelSession *mail_component_peek_session(MailComponent *component) +CamelSession *mail_component_peek_session(MailComponent *component) { MAIL_COMPONENT_DEFAULT(component); @@ -1546,7 +1546,7 @@ mail_component_peek_local_store (MailComponent *mc) * * Return value: **/ -struct _CamelFolder * +CamelFolder * mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id) { g_return_val_if_fail (id <= MAIL_COMPONENT_FOLDER_LOCAL_INBOX, NULL); diff --git a/mail/mail-component.h b/mail/mail-component.h index ef781d119a..18ec0a7dd9 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -28,8 +28,9 @@ #include <bonobo/bonobo-object.h> #include "shell/evolution-component.h" #include "mail/Evolution-Mail.h" - -struct _CamelStore; +#include "mail/em-folder-tree-model.h" +#include "filter/rule-context.h" +#include "misc/e-activity-handler.h" #define MAIL_TYPE_COMPONENT (mail_component_get_type ()) #define MAIL_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_COMPONENT, MailComponent)) @@ -68,20 +69,20 @@ MailComponent *mail_component_peek (void); /* NOTE: Using NULL as the component implies using the default component */ const gchar *mail_component_peek_base_directory (MailComponent *component); -struct _RuleContext *mail_component_peek_search_context (MailComponent *component); -struct _EActivityHandler *mail_component_peek_activity_handler (MailComponent *component); +RuleContext *mail_component_peek_search_context (MailComponent *component); +EActivityHandler *mail_component_peek_activity_handler (MailComponent *component); -struct _CamelSession *mail_component_peek_session(MailComponent *); +CamelSession *mail_component_peek_session(MailComponent *); void mail_component_add_store (MailComponent *component, - struct _CamelStore *store, + CamelStore *store, const gchar *name); -struct _CamelStore *mail_component_load_store_by_uri (MailComponent *component, +CamelStore *mail_component_load_store_by_uri (MailComponent *component, const gchar *uri, const gchar *name); void mail_component_remove_store (MailComponent *component, - struct _CamelStore *store); + CamelStore *store); void mail_component_remove_store_by_uri (MailComponent *component, const gchar *uri); @@ -90,12 +91,12 @@ void mail_component_stores_foreach (MailComponent *component, GHFunc func, void *data); -void mail_component_remove_folder (MailComponent *component, struct _CamelStore *store, const gchar *path); +void mail_component_remove_folder (MailComponent *component, CamelStore *store, const gchar *path); -struct _EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component); +EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component); -struct _CamelStore *mail_component_peek_local_store (MailComponent *mc); -struct _CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id); +CamelStore *mail_component_peek_local_store (MailComponent *mc); +CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id); const gchar *mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id); gint status_check (GNOME_Evolution_ShellState shell_state); diff --git a/mail/mail-config.h b/mail/mail-config.h index 8ebb3dc78c..0b431537bd 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -23,22 +23,13 @@ #ifndef MAIL_CONFIG_H #define MAIL_CONFIG_H -#include <glib.h> -#include <glib-object.h> +#include <gtk/gtk.h> +#include <camel/camel-provider.h> +#include <libedataserver/e-account.h> +#include <libedataserver/e-account-list.h> -#include "camel/camel-provider.h" /* can't forward-declare enums, bah */ - -struct _EAccount; -struct _EAccountList; -struct _EAccountService; - -struct _ESignature; -struct _ESignatureList; - -struct _GConfClient; -struct _GtkWindow; - -struct _CamelFolder; +#include <e-util/e-signature.h> +#include <e-util/e-signature-list.h> G_BEGIN_DECLS @@ -90,7 +81,7 @@ void mail_config_clear (void); void mail_config_write (void); void mail_config_write_on_exit (void); -struct _GConfClient *mail_config_get_gconf_client (void); +GConfClient *mail_config_get_gconf_client (void); /* General Accessor functions */ gboolean mail_config_is_configured (void); @@ -100,41 +91,41 @@ GSList *mail_config_get_labels (void); const gchar **mail_config_get_allowable_mime_types (void); -void mail_config_service_set_save_passwd (struct _EAccountService *service, gboolean save_passwd); +void mail_config_service_set_save_passwd (EAccountService *service, gboolean save_passwd); /* accounts */ -gboolean mail_config_find_account (struct _EAccount *account); -struct _EAccount *mail_config_get_default_account (void); -struct _EAccount *mail_config_get_account_by_name (const gchar *account_name); -struct _EAccount *mail_config_get_account_by_uid (const gchar *uid); -struct _EAccount *mail_config_get_account_by_source_url (const gchar *url); -struct _EAccount *mail_config_get_account_by_transport_url (const gchar *url); - -struct _EAccountList *mail_config_get_accounts (void); -void mail_config_add_account (struct _EAccount *account); -void mail_config_remove_account (struct _EAccount *account); -void mail_config_set_default_account (struct _EAccount *account); +gboolean mail_config_find_account (EAccount *account); +EAccount *mail_config_get_default_account (void); +EAccount *mail_config_get_account_by_name (const gchar *account_name); +EAccount *mail_config_get_account_by_uid (const gchar *uid); +EAccount *mail_config_get_account_by_source_url (const gchar *url); +EAccount *mail_config_get_account_by_transport_url (const gchar *url); + +EAccountList *mail_config_get_accounts (void); +void mail_config_add_account (EAccount *account); +void mail_config_remove_account (EAccount *account); +void mail_config_set_default_account (EAccount *account); gint mail_config_get_address_count (void); gint mail_config_get_message_limit (void); gboolean mail_config_get_enable_magic_spacebar (void); -void mail_config_remove_account_proxies (struct _EAccount *account); +void mail_config_remove_account_proxies (EAccount *account); void mail_config_prune_proxies (void); -gint mail_config_has_proxies (struct _EAccount *account); +gint mail_config_has_proxies (EAccount *account); -struct _EAccountIdentity *mail_config_get_default_identity (void); -struct _EAccountService *mail_config_get_default_transport (void); +EAccountIdentity *mail_config_get_default_identity (void); +EAccountService *mail_config_get_default_transport (void); void mail_config_save_accounts (void); /* signatures */ -struct _ESignature *mail_config_signature_new (const gchar *filename, gboolean script, gboolean html); -struct _ESignature *mail_config_get_signature_by_uid (const gchar *uid); -struct _ESignature *mail_config_get_signature_by_name (const gchar *name); +ESignature *mail_config_signature_new (const gchar *filename, gboolean script, gboolean html); +ESignature *mail_config_get_signature_by_uid (const gchar *uid); +ESignature *mail_config_get_signature_by_name (const gchar *name); -struct _ESignatureList *mail_config_get_signatures (void); -void mail_config_add_signature (struct _ESignature *signature); -void mail_config_remove_signature (struct _ESignature *signature); +ESignatureList *mail_config_get_signatures (void); +void mail_config_add_signature (ESignature *signature); +void mail_config_remove_signature (ESignature *signature); void mail_config_save_signatures (void); @@ -146,8 +137,8 @@ void mail_config_uri_renamed (GCompareFunc uri_cmp, const gchar *old, const gcha void mail_config_uri_deleted (GCompareFunc uri_cmp, const gchar *uri); /* static utility functions */ -gchar *mail_config_folder_to_cachename (struct _CamelFolder *folder, const gchar *prefix); -gchar *mail_config_folder_to_safe_url (struct _CamelFolder *folder); +gchar *mail_config_folder_to_cachename (CamelFolder *folder, const gchar *prefix); +gchar *mail_config_folder_to_safe_url (CamelFolder *folder); guint mail_config_get_error_timeout (void); guint mail_config_get_error_level (void); diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h index 0ed51e3ff1..d4d5b7f504 100644 --- a/mail/mail-crypto.h +++ b/mail/mail-crypto.h @@ -25,10 +25,8 @@ G_BEGIN_DECLS -struct _EAccount; - /* PGP/MIME convenience wrappers */ -struct _CamelCipherContext *mail_crypto_get_pgp_cipher_context(struct _EAccount *account); +CamelCipherContext *mail_crypto_get_pgp_cipher_context(EAccount *account); G_END_DECLS diff --git a/mail/mail-mt.c b/mail/mail-mt.c index bc94d4538f..61e7c780f3 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -51,7 +51,7 @@ #define d(x) static void set_stop(gint sensitive); -static void mail_operation_status(struct _CamelOperation *op, const gchar *what, gint pc, gpointer data); +static void mail_operation_status(CamelOperation *op, const gchar *what, gint pc, gpointer data); #ifdef LOG_LOCKS #define MAIL_MT_LOCK(x) (log_locks?fprintf(log, "%" G_GINT64_MODIFIER "x: lock " # x "\n", e_util_pthread_id(pthread_self())):0, pthread_mutex_lock(&x)) @@ -930,7 +930,7 @@ void mail_disable_stop(void) struct _op_status_msg { MailMsg base; - struct _CamelOperation *op; + CamelOperation *op; gchar *what; gint pc; gpointer data; @@ -1032,7 +1032,7 @@ static MailMsgInfo op_status_info = { }; static void -mail_operation_status (struct _CamelOperation *op, const gchar *what, gint pc, gpointer data) +mail_operation_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) { struct _op_status_msg *m; diff --git a/mail/mail-tools.h b/mail/mail-tools.h index 11e7c87dcd..ceb3ce8fb0 100644 --- a/mail/mail-tools.h +++ b/mail/mail-tools.h @@ -24,39 +24,35 @@ #define MAIL_TOOLS_H #include <glib.h> - -struct _CamelFolder; -struct _CamelException; -struct _CamelMimeMessage; -struct _CamelMimePart; -struct _camel_header_raw; +#include <camel/camel-folder.h> +#include <camel/camel-mime-message.h> /* Get the "inbox" for a url (uses global session) */ -struct _CamelFolder *mail_tool_get_inbox (const gchar *url, struct _CamelException *ex); +CamelFolder *mail_tool_get_inbox (const gchar *url, CamelException *ex); /* Get the "trash" for a url (uses global session) */ -struct _CamelFolder *mail_tool_get_trash (const gchar *url, gint connect, struct _CamelException *ex); +CamelFolder *mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex); /* Does a camel_movemail into the local movemail folder * and returns the path to the new movemail folder that was created. which shoudl be freed later */ -gchar *mail_tool_do_movemail (const gchar *source_url, struct _CamelException *ex); +gchar *mail_tool_do_movemail (const gchar *source_url, CamelException *ex); -struct _camel_header_raw *mail_tool_remove_xevolution_headers (struct _CamelMimeMessage *message); -void mail_tool_restore_xevolution_headers (struct _CamelMimeMessage *message, struct _camel_header_raw *); +struct _camel_header_raw *mail_tool_remove_xevolution_headers (CamelMimeMessage *message); +void mail_tool_restore_xevolution_headers (CamelMimeMessage *message, struct _camel_header_raw *); /* Generates the subject for a message forwarding @msg */ -gchar *mail_tool_generate_forward_subject (struct _CamelMimeMessage *msg); +gchar *mail_tool_generate_forward_subject (CamelMimeMessage *msg); /* Make a message into an attachment */ -struct _CamelMimePart *mail_tool_make_message_attachment (struct _CamelMimeMessage *message); +CamelMimePart *mail_tool_make_message_attachment (CamelMimeMessage *message); -/* Parse the ui into a real struct _CamelFolder any way we know how. */ -struct _CamelFolder *mail_tool_uri_to_folder (const gchar *uri, guint32 flags, struct _CamelException *ex); +/* Parse the ui into a real CamelFolder any way we know how. */ +CamelFolder *mail_tool_uri_to_folder (const gchar *uri, guint32 flags, CamelException *ex); -GHashTable *mail_lookup_url_table (struct _CamelMimeMessage *mime_message); +GHashTable *mail_lookup_url_table (CamelMimeMessage *mime_message); -struct _CamelFolder *mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids); +CamelFolder *mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids); -gchar *mail_tools_folder_to_url (struct _CamelFolder *folder); +gchar *mail_tools_folder_to_url (CamelFolder *folder); #endif diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index 9eb1f85ac2..79374348ae 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -22,35 +22,35 @@ #ifndef _MAIL_VFOLDER_H #define _MAIL_VFOLDER_H -struct _CamelStore; -struct _FilterPart; -struct _FilterRule; -struct _CamelMimeMessage; -struct _EMVFolderRule; -struct _CamelInternetAddress; +#include <camel/camel-internet-address.h> +#include <camel/camel-mime-message.h> + +#include <filter/filter-part.h> +#include <filter/filter-rule.h> +#include <mail/em-vfolder-rule.h> void vfolder_load_storage(void); void vfolder_revert(void); void vfolder_edit (void); void vfolder_edit_rule(const gchar *name); -struct _FilterPart *vfolder_create_part (const gchar *name); -struct _FilterRule *vfolder_clone_rule (struct _FilterRule *in); -void vfolder_gui_add_rule (struct _EMVFolderRule *rule); -void vfolder_gui_add_from_message (struct _CamelMimeMessage *msg, gint flags, const gchar *source); -void vfolder_gui_add_from_address (struct _CamelInternetAddress *addr, gint flags, const gchar *source); +FilterPart *vfolder_create_part (const gchar *name); +FilterRule *vfolder_clone_rule (FilterRule *in); +void vfolder_gui_add_rule (EMVFolderRule *rule); +void vfolder_gui_add_from_message (CamelMimeMessage *msg, gint flags, const gchar *source); +void vfolder_gui_add_from_address (CamelInternetAddress *addr, gint flags, const gchar *source); GList * mail_vfolder_get_sources_local (void); GList * mail_vfolder_get_sources_remote (void); /* add a uri that is now (un)available to vfolders in a transient manner */ -void mail_vfolder_add_uri(struct _CamelStore *store, const gchar *uri, gint remove); +void mail_vfolder_add_uri(CamelStore *store, const gchar *uri, gint remove); /* note that a folder has changed name (uri) */ -void mail_vfolder_rename_uri(struct _CamelStore *store, const gchar *from, const gchar *to); +void mail_vfolder_rename_uri(CamelStore *store, const gchar *from, const gchar *to); /* remove a uri that should be removed from vfolders permanently */ -void mail_vfolder_delete_uri(struct _CamelStore *store, const gchar *uri); +void mail_vfolder_delete_uri(CamelStore *store, const gchar *uri); /* close up, clean up */ void mail_vfolder_shutdown (void); diff --git a/mail/message-list.h b/mail/message-list.h index 8949b91347..259ec501dd 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -24,6 +24,7 @@ #define _MESSAGE_LIST_H_ #include <gtk/gtk.h> +#include <camel/camel-folder-thread.h> #include <table/e-table-simple.h> #include <table/e-tree-scrolled.h> @@ -156,7 +157,7 @@ struct _MessageList { gchar *frozen_search; /* to save search took place while we were frozen */ /* the current camel folder thread tree, if any */ - struct _CamelFolderThread *thread_tree; + CamelFolderThread *thread_tree; /* for message/folder chagned event handling */ struct _MailAsyncEvent *async_event; diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h index bc8c793eff..c7ed55c61a 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -42,13 +42,13 @@ typedef struct _MessageTagFollowUpClass MessageTagFollowUpClass; struct _MessageTagFollowUp { MessageTagEditor parent; - struct _GtkTreeView *message_list; + GtkTreeView *message_list; - struct _GtkComboBox *combo_entry; + GtkComboBox *combo_entry; struct _EDateEdit *target_date; - struct _GtkToggleButton *completed; - struct _GtkButton *clear; + GtkToggleButton *completed; + GtkButton *clear; time_t completed_date; }; diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index d651ad4a56..960c844aa4 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -25,9 +25,9 @@ #include <libedataserver/e-source.h> #include <string.h> -struct _GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); +GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); -struct _GtkWidget * +GtkWidget * e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) { EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h index 9682a6877b..1c4cedbe5a 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.h +++ b/plugins/groupwise-account-setup/camel-gw-listener.h @@ -40,6 +40,7 @@ G_BEGIN_DECLS typedef struct _CamelGwListener CamelGwListener; typedef struct _CamelGwListenerClass CamelGwListenerClass; typedef struct _CamelGwListenerPrivate CamelGwListenerPrivate; + struct _CamelGwListener { GObject parent; diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index fd728cbb21..3216ed9d9b 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -39,41 +39,27 @@ G_BEGIN_DECLS typedef struct _JunkSettings JunkSettings; typedef struct _JunkSettingsClass JunkSettingsClass; -struct _GtkWidget; -struct _GladeXML; -struct _GtkButton; -struct _GtkTreeView; -struct _GtkLabel; -struct _GtkEntry; -struct _GtkWindow; -struct _GtkRadioButton; -struct _GtkListStore; -struct _GtkCellRenderer; -struct _GtkTreeViewColumn; -struct _GtkFrame; -struct _GtkVBox; - struct _JunkSettings { GtkVBox parent_object; - struct _GladeXML *xml; + GladeXML *xml; /* General tab */ /* Default Behavior */ - struct _GtkTreeView *entry_list; - struct _GtkButton *add_button; - struct _GtkButton *remove; - struct _GtkEntry *entry; - struct _GtkRadioButton *enable; - struct _GtkRadioButton *disable; - struct _GtkWidget *scrolled_window; - struct _GtkListStore *model; - struct _GtkCellRenderer *cell; - struct _GtkTreeViewColumn *column; - struct _GtkVBox *vbox; - struct _GtkVBox *table; - struct _GtkWidget *window; + GtkTreeView *entry_list; + GtkButton *add_button; + GtkButton *remove; + GtkEntry *entry; + GtkRadioButton *enable; + GtkRadioButton *disable; + GtkWidget *scrolled_window; + GtkListStore *model; + GtkCellRenderer *cell; + GtkTreeViewColumn *column; + GtkVBox *vbox; + GtkVBox *table; + GtkWidget *window; GList *junk_list; gint users; @@ -89,7 +75,7 @@ struct _JunkSettingsClass { }; GType junk_settings_get_type (void); -struct _JunkSettings * junk_settings_new (EGwConnection *ccnc); +JunkSettings * junk_settings_new (EGwConnection *ccnc); void commit_changes (JunkSettings *js); G_END_DECLS diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index d95d9732a4..5108d02c19 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -40,45 +40,31 @@ G_BEGIN_DECLS typedef struct _ShareFolder ShareFolder; typedef struct _ShareFolderClass ShareFolderClass; -struct _GtkWidget; -struct _GladeXML; -struct _GtkButton; -struct _GtkTreeView; -struct _GtkLabel; -struct _GtkEntry; -struct _GtkWindow; -struct _GtkRadioButton; -struct _GtkListStore; -struct _GtkCellRenderer; -struct _GtkTreeViewColumn; -struct _GtkFrame; -struct _GtkVBox; - struct _ShareFolder { GtkVBox parent_object; - struct _GladeXML *xml; + GladeXML *xml; /* General tab */ /* Default Behavior */ - struct _GtkTreeView *user_list; - struct _GtkTextView *message; - struct _GtkButton *add_button; - struct _GtkButton *remove; - struct _GtkButton *add_book; - struct _GtkButton *notification; - struct _GtkEntry *name; - struct _GtkEntry *subject; - struct _GtkRadioButton *shared; - struct _GtkRadioButton *not_shared; - struct _GtkWidget *scrolled_window; - struct _GtkListStore *model; - struct _GtkCellRenderer *cell; - struct _GtkTreeViewColumn *column; - struct _GtkVBox *vbox; - struct _GtkVBox *table; - struct _GtkWidget *window; + GtkTreeView *user_list; + GtkTextView *message; + GtkButton *add_button; + GtkButton *remove; + GtkButton *add_book; + GtkButton *notification; + GtkEntry *name; + GtkEntry *subject; + GtkRadioButton *shared; + GtkRadioButton *not_shared; + GtkWidget *scrolled_window; + GtkListStore *model; + GtkCellRenderer *cell; + GtkTreeViewColumn *column; + GtkVBox *vbox; + GtkVBox *table; + GtkWidget *window; GList *users_list; EGwContainer *gcontainer; diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h index 9a0c3642eb..97c1b33919 100644 --- a/plugins/hula-account-setup/camel-hula-listener.h +++ b/plugins/hula-account-setup/camel-hula-listener.h @@ -40,6 +40,7 @@ G_BEGIN_DECLS typedef struct _CamelHulaListener CamelHulaListener; typedef struct _CamelHulaListenerClass CamelHulaListenerClass; typedef struct _CamelHulaListenerPrivate CamelHulaListenerPrivate; + struct _CamelHulaListener { GObject parent; diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am index 5616f273ea..d10638d90a 100644 --- a/plugins/mail-account-disable/Makefile.am +++ b/plugins/mail-account-disable/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_builddir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 4228a90be5..f3434fd4e8 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -7,6 +7,7 @@ endif INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 9a3749d676..5261fbcf97 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 78fd37b999..e7fa727ff1 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -323,7 +323,7 @@ report_error_idle (const gchar *format, const gchar *param) typedef struct { ECal *client; - struct _CamelFolder *folder; + CamelFolder *folder; GPtrArray *uids; gchar *selected_text; gboolean with_attendees; @@ -333,7 +333,7 @@ static gboolean do_mail_to_event (AsyncData *data) { ECal *client = data->client; - struct _CamelFolder *folder = data->folder; + CamelFolder *folder = data->folder; GPtrArray *uids = data->uids; GError *err = NULL; gboolean readonly = FALSE; diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 3c794393b2..c8119f48bb 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 6894e6b21e..8336dd12ec 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am index 8c872f23a5..ec90904e70 100644 --- a/plugins/select-one-source/Makefile.am +++ b/plugins/select-one-source/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/shell/e-component-view.c b/shell/e-component-view.c index 8e75b5b4a8..58ea3f9a89 100644 --- a/shell/e-component-view.c +++ b/shell/e-component-view.c @@ -93,7 +93,7 @@ e_component_view_init (EComponentView *shell) { } -EComponentView *e_component_view_new(GNOME_Evolution_ShellView parent, const gchar *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *statusbar) +EComponentView *e_component_view_new(GNOME_Evolution_ShellView parent, const gchar *id, GtkWidget *side, GtkWidget *view, GtkWidget *statusbar) { EComponentView *new = g_object_new (e_component_view_get_type (), NULL); CORBA_Environment ev = { NULL }; diff --git a/shell/e-component-view.h b/shell/e-component-view.h index ef8a6e813c..ca40e3c381 100644 --- a/shell/e-component-view.h +++ b/shell/e-component-view.h @@ -24,12 +24,11 @@ #ifndef _E_COMPONENT_VIEW_H_ #define _E_COMPONENT_VIEW_H_ +#include <gtk/gtk.h> #include <bonobo/bonobo-object.h> G_BEGIN_DECLS -struct _GtkWidget; - typedef struct _EComponentView EComponentView; typedef struct _EComponentViewPrivate EComponentViewPrivate; typedef struct _EComponentViewClass EComponentViewClass; @@ -62,7 +61,7 @@ struct _EComponentViewClass { }; GType e_component_view_get_type(void); -EComponentView *e_component_view_new(GNOME_Evolution_ShellView shell_view, const gchar *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *status); +EComponentView *e_component_view_new(GNOME_Evolution_ShellView shell_view, const gchar *id, GtkWidget *side, GtkWidget *view, GtkWidget *status); EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, const gchar *id, struct _BonoboControl *side, struct _BonoboControl *view, struct _BonoboControl *statusbar); void e_component_view_set_title(EComponentView *ecv, const gchar *title); diff --git a/smime/gui/cert-trust-dialog.h b/smime/gui/cert-trust-dialog.h index abdeb4d2ff..c4852aac66 100644 --- a/smime/gui/cert-trust-dialog.h +++ b/smime/gui/cert-trust-dialog.h @@ -24,9 +24,12 @@ #ifndef _CERT_TRUST_DIALOG_H_ #define _CERT_TRUST_DIALOG_H -struct _GtkWidget; -struct _ECert; +#include <gtk/gtk.h> -struct _GtkWidget* cert_trust_dialog_show (struct _ECert *cert); +G_BEGIN_DECLS + +GtkWidget* cert_trust_dialog_show (ECert *cert); + +G_END_DECLS #endif /* _CERT_TRUST_DIALOG_H_ */ diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h index 8509e30130..977cc6ac4f 100644 --- a/widgets/misc/e-info-label.h +++ b/widgets/misc/e-info-label.h @@ -36,8 +36,8 @@ typedef struct _EInfoLabelClass EInfoLabelClass; struct _EInfoLabel { GtkHBox parent; - struct _GtkWidget *location; - struct _GtkWidget *info; + GtkWidget *location; + GtkWidget *info; }; struct _EInfoLabelClass { diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index f16c061610..0a9a738398 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -36,15 +36,14 @@ G_BEGIN_DECLS typedef struct _ETextModel ETextModel; typedef struct _ETextModelClass ETextModelClass; - -struct _ETextModelPrivate; +typedef struct _ETextModelPrivate ETextModelPrivate; typedef gint (*ETextModelReposFn) (gint, gpointer); struct _ETextModel { GObject item; - struct _ETextModelPrivate *priv; + ETextModelPrivate *priv; }; struct _ETextModelClass { |