diff options
24 files changed, 90 insertions, 32 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 03f2e1b3a9..c7c74a95ed 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,29 @@ +2001-03-26 Kjartan Maraas <kmaraas@gnome.org> + + * cal-client/client-test.c: Replace includes of <gnome.h>, <bonobo.h> + and <gtk/gtk.h> with the needed headers to speed up compile. + * cal-util/test-recur.c: Same here for <gtk/gtk.h> + * gui/calendar-commands.c: Replace <bonobo.h> and remove + <libgnorba/gnorba.h> + * gui/calendar-summary.c: Replace <gnome.h> and <bonobo.h> + * gui/calendar-summary.h: Added <bonobo/bonobo-generic-factory.h> + * gui/component-factory.c: Remove <bonobo.h> + * gui/control-factory.c: Replace <bonobo.h> + * gui/e-calendar-table.c: Remove <gnome.h> + * gui/e-itip-control.c: Replace <gnome.h> and <bonobo.h> + * gui/e-meeting-edit.c: Replace <bonobo.h> + * gui/e-tasks.c: Replace <gnome.h> + * gui/e-tasks.h: Replace <bonobo.h> + * gui/gnome-cal.h: Remove <bonobo.h> + * gui/main.c: Replace <bonobo.h> and <glade/glade.h> + * gui/tasks-control-factory.c: Replace <bonobo.h> + * gui/tasks-control.c: Replace <gnome.h> and <bonobo.h> + * gui/weekday-picker.c: Add <string.h> and <libgnome/gnome-defs.h> + * gui/alarm-notify/client-main.c: Remove <gnome.h> and <bonobo.h> + * gui/alarm-notify/notify-main.c: Replace <gnome.h> and <bonobo.h> + * gui/dialogs/alarm-notify-dialog.c: Replace <gnome.h> + * pcs/cal-backend.c: Replace <gtk/gtk.h> + 2001-03-25 Federico Mena Quintero <federico@ximian.com> * gui/e-calendar-table.c (e_calendar_table_init): The diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c index 7ff8aab8fc..d6a57cbffd 100644 --- a/calendar/cal-client/client-test.c +++ b/calendar/cal-client/client-test.c @@ -21,10 +21,15 @@ */ #include <config.h> -#include <bonobo.h> +#include <stdlib.h> +#include <gtk/gtkmain.h> +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-init.h> #include <liboaf/liboaf.h> -#include <gnome.h> -#include <cal-client/cal-client.h> +#include <bonobo/bonobo-main.h> +#include "cal-client.h" static CalClient *client1; static CalClient *client2; diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c index a049ea955b..e84b0f9201 100644 --- a/calendar/cal-util/test-recur.c +++ b/calendar/cal-util/test-recur.c @@ -34,7 +34,9 @@ #include <config.h> #include <stdio.h> -#include <gtk/gtk.h> +#include <stdlib.h> +#include <string.h> +#include <gtk/gtkmain.h> #include <cal-util/cal-recur.h> diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index fbd8c1f097..164d043e13 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -21,7 +21,12 @@ */ #include <config.h> -#include <gnome.h> +#include <gtk/gtklabel.h> +#include <gtk/gtkspinbutton.h> +#include <gtk/gtksignal.h> +#include <gtk/gtkwindow.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include "alarm-notify-dialog.h" diff --git a/calendar/gui/alarm-notify/client-main.c b/calendar/gui/alarm-notify/client-main.c index db777926a3..5b0fb669d2 100644 --- a/calendar/gui/alarm-notify/client-main.c +++ b/calendar/gui/alarm-notify/client-main.c @@ -24,8 +24,6 @@ #endif #include <liboaf/liboaf.h> -#include <gnome.h> -#include <bonobo.h> #include "evolution-calendar.h" diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index 6ea5a902f5..ec43738e96 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -24,8 +24,12 @@ #include "config.h" #endif -#include <gnome.h> -#include <bonobo.h> +#include <glib.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-init.h> +#include <bonobo/bonobo-main.h> +#include <bonobo/bonobo-generic-factory.h> #include <liboaf/liboaf.h> #include "alarm-notify.h" diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index e92b47f819..e60f381f47 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -33,11 +33,11 @@ #include <ctype.h> #include <errno.h> #include <glib.h> +#include <gdk-pixbuf/gdk-pixbuf.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-messagebox.h> -#include <libgnorba/gnorba.h> -#include <bonobo.h> +#include <bonobo/bonobo-ui-util.h> #include <cal-util/timeutil.h> #include "calendar-commands.h" #include "gnome-cal.h" diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 8486e9cca8..5135eb26b8 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -23,7 +23,6 @@ */ #include <config.h> -#include <bonobo.h> #include "evolution-shell-component.h" #include <executive-summary/evolution-services/executive-summary-component.h> #include "component-factory.h" diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c index 163d56f524..fd7ff0fbf2 100644 --- a/calendar/gui/calendar-summary.c +++ b/calendar/gui/calendar-summary.c @@ -28,9 +28,9 @@ #include <time.h> -#include <gnome.h> -#include <bonobo.h> - +#include <bonobo/bonobo-persist-stream.h> +#include <bonobo/bonobo-property-control.h> +#include <bonobo/bonobo-stream-client.h> #include <liboaf/liboaf.h> #include <evolution-services/executive-summary-component.h> diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h index cfb92c0697..eebed7c5ad 100644 --- a/calendar/gui/calendar-summary.h +++ b/calendar/gui/calendar-summary.h @@ -25,6 +25,7 @@ #ifndef CALENDAR_SUMMARY_H #define CALENDAR_SUMMARY_H +#include <bonobo/bonobo-generic-factory.h> #include <evolution-services/executive-summary-component.h> BonoboGenericFactory *calendar_summary_factory_init (void); diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index 8486e9cca8..5135eb26b8 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -23,7 +23,6 @@ */ #include <config.h> -#include <bonobo.h> #include "evolution-shell-component.h" #include <executive-summary/evolution-services/executive-summary-component.h> #include "component-factory.h" diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index 1f834e5ad6..32b596dde3 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -24,8 +24,9 @@ #include <config.h> #include <glade/glade.h> -#include <bonobo.h> #include <bonobo/bonobo-control.h> +#include <bonobo/bonobo-generic-factory.h> +#include <bonobo/bonobo-persist-file.h> #include <glade/glade.h> #include <liboaf/liboaf.h> diff --git a/calendar/gui/dialogs/alarm-notify-dialog.c b/calendar/gui/dialogs/alarm-notify-dialog.c index fbd8c1f097..164d043e13 100644 --- a/calendar/gui/dialogs/alarm-notify-dialog.c +++ b/calendar/gui/dialogs/alarm-notify-dialog.c @@ -21,7 +21,12 @@ */ #include <config.h> -#include <gnome.h> +#include <gtk/gtklabel.h> +#include <gtk/gtkspinbutton.h> +#include <gtk/gtksignal.h> +#include <gtk/gtkwindow.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include "alarm-notify-dialog.h" diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 0c709c92ae..83f54160c6 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -31,7 +31,6 @@ #include <config.h> #include <sys/stat.h> #include <unistd.h> -#include <gnome.h> #include <gal/e-table/e-table-scrolled.h> #include <gal/e-table/e-cell-checkbox.h> #include <gal/e-table/e-cell-toggle.h> diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 65905b7efb..668456c13b 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -23,8 +23,16 @@ #include <config.h> #include <time.h> -#include <gnome.h> -#include <bonobo.h> +#include <glib.h> +#include <gtk/gtkobject.h> +#include <gtk/gtkwidget.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-dialog-util.h> +#include <bonobo/bonobo-generic-factory.h> +#include <bonobo/bonobo-persist-stream.h> +#include <bonobo/bonobo-stream-client.h> #include <glade/glade.h> #include <ical.h> #include <Evolution-Composer.h> diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c index 934c284ae7..df02718ee1 100644 --- a/calendar/gui/e-meeting-edit.c +++ b/calendar/gui/e-meeting-edit.c @@ -21,7 +21,8 @@ */ #include <config.h> -#include <bonobo.h> +#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-object-client.h> #include <glade/glade.h> #include <ical.h> #include <widgets/meeting-time-sel/e-meeting-time-sel.h> diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index d15d332cde..69e6ddaeb4 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -24,7 +24,6 @@ */ #include <config.h> -#include <gnome.h> #include <gal/util/e-util.h> #include <gal/e-table/e-table-scrolled.h> #include <gal/menus/gal-view-collection.h> @@ -32,6 +31,7 @@ #include <gal/menus/gal-view-etable.h> #include "widgets/menus/gal-view-menus.h" #include "dialogs/task-editor.h" +#include "calendar-config.h" #include "e-calendar-table.h" #include "calendar-config.h" #include "component-factory.h" diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h index 03b4abf142..21660c8c7e 100644 --- a/calendar/gui/e-tasks.h +++ b/calendar/gui/e-tasks.h @@ -26,8 +26,8 @@ #ifndef _E_TASKS_H_ #define _E_TASKS_H_ +#include <gtk/gtktable.h> #include <cal-client/cal-client.h> -#include <bonobo.h> #define E_TYPE_TASKS (e_tasks_get_type ()) #define E_TASKS(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TASKS, ETasks)) diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index 0d2e1d92a1..0192efabe4 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -29,7 +29,6 @@ #include <time.h> #include <libgnome/gnome-defs.h> #include <gtk/gtkvbox.h> -#include <bonobo.h> #include <widgets/misc/e-calendar.h> #include <cal-client/cal-client.h> diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 2060934fa2..031683795c 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -25,11 +25,11 @@ #include <config.h> #endif -#include <glade/glade.h> -#include <bonobo.h> +#include <libgnome/gnome-defs.h> #include <glade/glade.h> #include <liboaf/liboaf.h> +#include <bonobo/bonobo-main.h> #include <gal/widgets/e-cursors.h> diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c index 635bd72bc0..8f884f4f6f 100644 --- a/calendar/gui/tasks-control-factory.c +++ b/calendar/gui/tasks-control-factory.c @@ -23,8 +23,8 @@ */ #include <config.h> -#include <bonobo.h> #include <bonobo/bonobo-control.h> +#include <bonobo/bonobo-generic-factory.h> #include <liboaf/liboaf.h> diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 08b49ff306..7fb981d868 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -23,9 +23,12 @@ */ #include <config.h> -#include <gnome.h> -#include <bonobo.h> +#include <glib.h> +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> #include <bonobo/bonobo-control.h> +#include <bonobo/bonobo-ui-util.h> #include "e-tasks.h" #include "tasks-control.h" diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index 3d19ac8b37..c34dd3da03 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -23,10 +23,12 @@ #include <config.h> #endif +#include <string.h> #include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-canvas-rect-ellipse.h> #include <libgnomeui/gnome-canvas-text.h> -#include <libgnome/gnome-i18n.h> #include "weekday-picker.h" diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c index a8c6aa9776..ce53cda78a 100644 --- a/calendar/pcs/cal-backend.c +++ b/calendar/pcs/cal-backend.c @@ -23,7 +23,8 @@ */ #include <config.h> -#include <gtk/gtk.h> +#include <gtk/gtkobject.h> +#include <gtk/gtksignal.h> #include <gnome-xml/parser.h> #include <gnome-xml/parserInternals.h> #include <gnome-xml/xmlmemory.h> |