diff options
25 files changed, 112 insertions, 108 deletions
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c index 26042ee25b..e6ccf0a64d 100644 --- a/addressbook/contact-editor/e-contact-editor.c +++ b/addressbook/contact-editor/e-contact-editor.c @@ -21,16 +21,16 @@ */ #include <config.h> + #include <time.h> #include <gtk/gtkcheckbutton.h> #include <gtk/gtkcheckmenuitem.h> #include <gtk/gtkcombo.h> #include <gtk/gtktext.h> -#include <gtk/gtktogglebutton.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-dateedit.h> #include <libgnomeui/gnome-popup-menu.h> +#include <libgnomeui/gnome-dateedit.h> +#include <libgnome/gnome-i18n.h> + #include <bonobo/bonobo-ui-container.h> #include <bonobo/bonobo-ui-util.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -38,13 +38,14 @@ #include <gal/widgets/e-categories.h> #include <gal/widgets/e-gui-utils.h> #include <gal/widgets/e-unicode.h> -#include <addressbook/printing/e-contact-print.h> -#include <addressbook/printing/e-contact-print-envelope.h> -#include <e-util/e-gui-utils.h> + +#include "addressbook/printing/e-contact-print.h" +#include "addressbook/printing/e-contact-print-envelope.h" +#include "e-util/e-gui-utils.h" #include "e-contact-editor.h" -#include "e-contact-editor-fullname.h" #include "e-contact-editor-address.h" +#include "e-contact-editor-fullname.h" #include "e-contact-save-as.h" /* Signal IDs */ diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h index a2f166741f..bc54dd02b0 100644 --- a/addressbook/contact-editor/e-contact-editor.h +++ b/addressbook/contact-editor/e-contact-editor.h @@ -25,8 +25,9 @@ #include <libgnomeui/gnome-app-helper.h> #include <bonobo/bonobo-ui-component.h> #include <glade/glade.h> -#include <addressbook/backend/ebook/e-card.h> -#include <addressbook/backend/ebook/e-card-simple.h> + +#include "addressbook/backend/ebook/e-card.h" +#include "addressbook/backend/ebook/e-card-simple.h" #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index 640217173d..5fcebee68d 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -65,6 +65,7 @@ #include <gal/util/e-util.h> #include <gal/util/e-xml-utils.h> +#include <libgnome/gnome-i18n.h> #include "evolution-shell-component.h" #include "evolution-storage.h" diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 26042ee25b..e6ccf0a64d 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -21,16 +21,16 @@ */ #include <config.h> + #include <time.h> #include <gtk/gtkcheckbutton.h> #include <gtk/gtkcheckmenuitem.h> #include <gtk/gtkcombo.h> #include <gtk/gtktext.h> -#include <gtk/gtktogglebutton.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-dateedit.h> #include <libgnomeui/gnome-popup-menu.h> +#include <libgnomeui/gnome-dateedit.h> +#include <libgnome/gnome-i18n.h> + #include <bonobo/bonobo-ui-container.h> #include <bonobo/bonobo-ui-util.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -38,13 +38,14 @@ #include <gal/widgets/e-categories.h> #include <gal/widgets/e-gui-utils.h> #include <gal/widgets/e-unicode.h> -#include <addressbook/printing/e-contact-print.h> -#include <addressbook/printing/e-contact-print-envelope.h> -#include <e-util/e-gui-utils.h> + +#include "addressbook/printing/e-contact-print.h" +#include "addressbook/printing/e-contact-print-envelope.h" +#include "e-util/e-gui-utils.h" #include "e-contact-editor.h" -#include "e-contact-editor-fullname.h" #include "e-contact-editor-address.h" +#include "e-contact-editor-fullname.h" #include "e-contact-save-as.h" /* Signal IDs */ diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index a2f166741f..bc54dd02b0 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -25,8 +25,9 @@ #include <libgnomeui/gnome-app-helper.h> #include <bonobo/bonobo-ui-component.h> #include <glade/glade.h> -#include <addressbook/backend/ebook/e-card.h> -#include <addressbook/backend/ebook/e-card-simple.h> + +#include "addressbook/backend/ebook/e-card.h" +#include "addressbook/backend/ebook/e-card-simple.h" #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 46210ec07c..685ee0b79d 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -22,42 +22,35 @@ #include <config.h> -#include <glib.h> -#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-paper.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> -#include <libgnome/gnome-paper.h> #include <gal/e-table/e-table-scrolled.h> #include <gal/e-table/e-table-model.h> #include <gal/widgets/e-scroll-frame.h> #include <gal/widgets/e-popup-menu.h> -#include "widgets/menus/gal-view-menus.h" - #include <gal/menus/gal-view-factory-etable.h> #include <gal/menus/gal-view-etable.h> +#include <libgnomeprint/gnome-print.h> +#include <libgnomeprint/gnome-print-dialog.h> +#include <libgnomeprint/gnome-print-master.h> +#include <libgnomeprint/gnome-print-master-preview.h> + +#include "widgets/menus/gal-view-menus.h" + +#include "addressbook/printing/e-contact-print.h" +#include "addressbook/printing/e-contact-print-envelope.h" + #include "gal-view-factory-minicard.h" #include "gal-view-minicard.h" #include "e-addressbook-view.h" #include "e-addressbook-model.h" - #include "e-minicard-view-widget.h" - -#include "e-contact-editor.h" #include "e-contact-save-as.h" -#include "addressbook/printing/e-contact-print.h" -#include "addressbook/printing/e-contact-print-envelope.h" -#include "e-card-simple.h" -#include "e-card.h" -#include "e-book.h" -#include "glade/glade-xml.h" - -#include <libgnomeprint/gnome-print.h> -#include <libgnomeprint/gnome-print-dialog.h> -#include <libgnomeprint/gnome-print-master.h> -#include <libgnomeprint/gnome-print-master-preview.h> +#include "e-contact-editor.h" static void e_addressbook_view_init (EAddressbookView *card); static void e_addressbook_view_class_init (EAddressbookViewClass *klass); diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index e481efec65..0c282c013a 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -21,7 +21,7 @@ #ifndef __E_ADDRESSBOOK_VIEW_H__ #define __E_ADDRESSBOOK_VIEW_H__ -#include <gtk/gtkobject.h> +#include <gtk/gtktable.h> #include <bonobo/bonobo-ui-component.h> #include "addressbook/backend/ebook/e-book.h" diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 7ad33894e4..639e41c2c7 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -22,10 +22,9 @@ #include <config.h> -#include <glib.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> #include <gal/widgets/e-canvas.h> +#include <libgnome/gnome-i18n.h> + #include "e-minicard-view.h" #include "e-minicard.h" #include "e-contact-editor.h" diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index 0e54c57164..2c31adb69b 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -47,6 +47,10 @@ #include "config.h" +#include <gtk/gtkmain.h> +#include <gtk/gtkvbox.h> +#include <libgnomeui/gnome-canvas-rect-ellipse.h> +#include <libgnomeui/gnome-init.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-reflow.h> #include <gal/widgets/e-scroll-frame.h> diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 0c8a9ea2e1..d31d252dfd 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -43,7 +43,7 @@ #include <libgnomeui/gnome-dialog-util.h> #include <libgnomeui/gnome-messagebox.h> #include <libgnomeui/gnome-stock.h> -#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-util.h> #include <libgnome/gnome-i18n.h> #include <bonobo/bonobo-ui-util.h> #include <cal-util/timeutil.h> diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c index 359a31239e..9f4f4b2217 100644 --- a/calendar/gui/calendar-model.c +++ b/calendar/gui/calendar-model.c @@ -22,7 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ - #include <config.h> #include <math.h> @@ -37,19 +36,16 @@ #undef __USE_XOPEN #include <ctype.h> -#include <glib.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> + #include <libgnomeui/gnome-messagebox.h> #include <libgnomeui/gnome-stock.h> +#include <libgnome/gnome-i18n.h> #include <gal/widgets/e-unicode.h> -#include <e-util/e-time-utils.h> -#include <cal-util/timeutil.h> -#include "calendar-model.h" -#include "calendar-commands.h" - - +#include "e-util/e-time-utils.h" +#include "cal-util/timeutil.h" +#include "calendar-commands.h" +#include "calendar-model.h" /* Private part of the ECalendarModel structure */ struct _CalendarModelPrivate { diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h index 2fb8e2c2a8..8b1db3c503 100644 --- a/calendar/gui/dialogs/save-comp.h +++ b/calendar/gui/dialogs/save-comp.h @@ -23,6 +23,8 @@ #ifndef SAVE_COMP_H #define SAVE_COMP_H +#include <gtk/gtkwindow.h> + gint save_component_dialog (GtkWindow *parent); #endif diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index b3831a09ee..828eff3419 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -27,33 +27,33 @@ */ #include <config.h> + +#include "e-day-view.h" + #include <math.h> #include <time.h> #include <gdk/gdkkeysyms.h> #include <gdk/gdkx.h> #include <gtk/gtkdnd.h> #include <gtk/gtkmain.h> -#include <gtk/gtkselection.h> #include <gtk/gtksignal.h> #include <gtk/gtkvscrollbar.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> +#include <gtk/gtkwindow.h> +#include <gal/e-text/e-text.h> +#include <gal/widgets/e-popup-menu.h> +#include <gal/widgets/e-canvas-utils.h> #include <libgnomeui/gnome-canvas-rect-ellipse.h> -#include <cal-util/timeutil.h> +#include <libgnome/gnome-i18n.h> + +#include "cal-util/timeutil.h" #include "dialogs/delete-comp.h" #include "comp-util.h" -#include "e-day-view.h" +#include "calendar-commands.h" +#include "goto.h" +#include "e-meeting-edit.h" #include "e-day-view-time-item.h" #include "e-day-view-top-item.h" #include "e-day-view-main-item.h" -#include "calendar-commands.h" -#include <gal/widgets/e-canvas.h> -#include <gal/e-text/e-text.h> -#include <gal/widgets/e-canvas-utils.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/widgets/e-popup-menu.h> -#include "e-meeting-edit.h" -#include "goto.h" /* Images */ #include "art/bell.xpm" diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 8adfdd96ff..da17673518 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -30,9 +30,12 @@ */ #include <config.h> -#include <gal/e-text/e-text.h> + #include "e-week-view-event-item.h" +#include <gtk/gtksignal.h> +#include <gal/e-text/e-text.h> + static void e_week_view_event_item_class_init (EWeekViewEventItemClass *class); static void e_week_view_event_item_init (EWeekViewEventItem *wveitem); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 3d9fa65a97..90a7b2c695 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -28,35 +28,34 @@ */ #include <config.h> + +#include "e-week-view.h" + #include <math.h> -#include <glib.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> #include <gtk/gtkvscrollbar.h> +#include <gtk/gtkwindow.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gnome-canvas-pixbuf.h> +#include <gal/e-text/e-text.h> +#include <gal/widgets/e-popup-menu.h> +#include <gal/widgets/e-canvas-utils.h> #include "dialogs/delete-comp.h" -#include "calendar-commands.h" #include "comp-util.h" -#include "e-week-view.h" +#include "cal-util/timeutil.h" +#include "calendar-commands.h" +#include "goto.h" +#include "e-meeting-edit.h" #include "e-week-view-event-item.h" #include "e-week-view-main-item.h" #include "e-week-view-titles-item.h" -#include <cal-util/timeutil.h> -#include <gal/widgets/e-canvas.h> -#include <gal/e-text/e-text.h> -#include <gal/widgets/e-popup-menu.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/widgets/e-canvas-utils.h> -#include "e-meeting-edit.h" -#include "goto.h" /* Images */ #include "art/bell.xpm" #include "art/recur.xpm" - #include "art/jump.xpm" #define E_WEEK_VIEW_SMALL_FONT \ diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 14eb6ea53a..314835c2c5 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -25,27 +25,25 @@ */ #include <config.h> -#include <glib.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-propertybox.h> +#include <string.h> #include <glade/glade.h> -#include <e-util/e-dialog-widgets.h> -#include <widgets/misc/e-dateedit.h> #include <gal/widgets/e-unicode.h> #include <gal/widgets/e-categories.h> -#include <cal-util/timeutil.h> +#include <libgnomeui/gnome-propertybox.h> +#include <libgnome/gnome-i18n.h> + +#include "calendar-config.h" +#include "cal-util/timeutil.h" #include "dialogs/delete-comp.h" #include "dialogs/save-comp.h" -#include "calendar-config.h" -#include "event-editor.h" #include "e-meeting-edit.h" -#include "calendar-config.h" +#include "e-util/e-dialog-widgets.h" +#include "event-editor.h" #include "tag-calendar.h" #include "weekday-picker.h" +#include "widgets/misc/e-dateedit.h" #include "widget-util.h" - enum {BEFORE, AFTER}; enum {MINUTES, HOURS, DAYS}; diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 28a9c24845..ca618f5b35 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -36,6 +36,10 @@ #include "Composer.h" +#include <gtk/gtkmenuitem.h> +#include <gtk/gtkoptionmenu.h> +#include <gtk/gtktooltips.h> + #include <gal/e-text/e-entry.h> #include <gal/widgets/e-unicode.h> diff --git a/e-util/e-time-utils.h b/e-util/e-time-utils.h index 762e410e69..22fa8f8a7d 100644 --- a/e-util/e-time-utils.h +++ b/e-util/e-time-utils.h @@ -11,6 +11,9 @@ #ifndef E_TIME_UTILS #define E_TIME_UTILS +#include <time.h> +#include <glib.h> + typedef enum { E_TIME_PARSE_OK, E_TIME_PARSE_NONE, diff --git a/e-util/ename/test-ename-western.c b/e-util/ename/test-ename-western.c index 3ac655aa22..09847b5b4b 100644 --- a/e-util/ename/test-ename-western.c +++ b/e-util/ename/test-ename-western.c @@ -1,7 +1,7 @@ #include <ctype.h> #include <stdio.h> #include <glib.h> -#include <libgnome/gnome-defs.h> +#include <gtk/gtkmain.h> #include <ename/e-name-western.h> static void diff --git a/filter/ChangeLog b/filter/ChangeLog index cbae352b9c..eec01c7c2c 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -21,15 +21,6 @@ (get_widget): Don't have a remove action button, we are putting this next to the rule part now. - * filter-rule.c (option_activate): Set the newpart on the - container object. - (less_parts): Remove the rule tht the user wants to remove. - (attach_rule): Attach a new rule and it's remove button to the end - of the table. - (more_parts): Fix to resize the table and such. - (get_widget): Don't have a remove action button, we are putting - this next to the rule part now. - 2001-03-30 Kjartan Maraas <kmaraas@gnome.org> * *.*: Fix headers. Remove unneccesary ones and replace diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c index dae8db5c7e..13465f0166 100644 --- a/shell/e-local-folder.c +++ b/shell/e-local-folder.c @@ -46,6 +46,8 @@ #include <gal/util/e-util.h> #include <gal/util/e-xml-utils.h> +#include <libgnome/gnome-util.h> + #include "e-local-folder.h" diff --git a/shell/e-shell-utils.h b/shell/e-shell-utils.h index a701dd38eb..732931535e 100644 --- a/shell/e-shell-utils.h +++ b/shell/e-shell-utils.h @@ -24,6 +24,8 @@ #ifndef E_SHELL_UTILS_H #define E_SHELL_UTILS_H +#include <glib.h> + char *e_shell_get_icon_path (const char *icon_name, gboolean try_mini); diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index e432a62a55..705b668cbc 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -33,10 +33,11 @@ #include <gal/e-table/e-cell-tree.h> #include <gal/e-table/e-cell-text.h> +#include <libgnome/gnome-util.h> + #include "e-util/e-gtk-utils.h" #include "e-shell-constants.h" - #include "e-local-storage.h" #include "e-storage-set-view.h" diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 8d942b2bba..220a2a75d8 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -8,15 +8,17 @@ * (C) 2000, 2001 Ximian, Inc. */ #include <config.h> + +#include "gal-view-menus.h" + #include <stdlib.h> #include <gtk/gtksignal.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include <libgnome/gnome-defs.h> +#include <libgnomeui/gnome-dialog.h> #include <libgnome/gnome-i18n.h> #include <gal/util/e-util.h> #include <gal/util/e-xml-utils.h> -#include "gal-view-menus.h" #include <gal/menus/gal-define-views-dialog.h> struct _GalViewMenusPrivate { diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 53c8578dc1..8f64684db6 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -29,13 +29,13 @@ #include <config.h> #include <time.h> -#include <gal/util/e-i18n.h> #include <gdk/gdkkeysyms.h> -#include <libgnomeui/gnome-messagebox.h> -#include <libgnomeui/gnome-stock.h> #include <gal/util/e-util.h> #include <gal/e-table/e-table-item.h> -#include <e-util/e-time-utils.h> +#include <libgnomeui/gnome-messagebox.h> +#include <libgnomeui/gnome-stock.h> +#include <libgnome/gnome-i18n.h> +#include "e-util/e-time-utils.h" #include "e-cell-date-edit.h" /* This depends on ECalendar which is why I didn't put it in gal. */ |