Stop abusing forward declarations.

5 files changed, 35 insertions, 33 deletions

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 bed87f618a..8d3ac6f8ac 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -169,8 +169,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 dfef719682..0803a4fb63 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,	\
@@ -134,7 +134,7 @@ 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_calendar_menu (GnomeCalendar *gcal);
+ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal);
 
 void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
 						   time_t	  start_time,