diff options
| author | JP Rosevear <jpr@novell.com> | 2004-10-08 05:03:36 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-10-08 05:03:36 +0800 |
| commit | 02a4d3a18624282178c05978d9f8cca7e225532c (patch) | |
| tree | 14235ed87aac65ccc5f5312fcc2cfe5fd5b00f32 /calendar | |
| parent | 63e2099d75600e4f83849f38f5390074a91e26fc (diff) | |
| download | gsoc2013-evolution-02a4d3a18624282178c05978d9f8cca7e225532c.tar gsoc2013-evolution-02a4d3a18624282178c05978d9f8cca7e225532c.tar.gz gsoc2013-evolution-02a4d3a18624282178c05978d9f8cca7e225532c.tar.bz2 gsoc2013-evolution-02a4d3a18624282178c05978d9f8cca7e225532c.tar.lz gsoc2013-evolution-02a4d3a18624282178c05978d9f8cca7e225532c.tar.xz gsoc2013-evolution-02a4d3a18624282178c05978d9f8cca7e225532c.tar.zst gsoc2013-evolution-02a4d3a18624282178c05978d9f8cca7e225532c.zip | |
guard config.h
2004-10-07 JP Rosevear <jpr@novell.com>
* gui/print.c: guard config.h
* gui/tasks-control.c: guard config.h, remove useless include
* gui/migration.c: remove useless include
* gui/main.c: remove useless include
* gui/e-calendar-view.h: #define the type
* gui/calendar-offline-handler.c: remove useless include
* gui/calendar-config.c: tidy header
svn path=/trunk/; revision=27501
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 16 | ||||
| -rw-r--r-- | calendar/gui/calendar-config.c | 4 | ||||
| -rw-r--r-- | calendar/gui/calendar-offline-handler.c | 1 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.h | 1 | ||||
| -rw-r--r-- | calendar/gui/main.c | 2 | ||||
| -rw-r--r-- | calendar/gui/migration.c | 1 | ||||
| -rw-r--r-- | calendar/gui/print.c | 3 | ||||
| -rw-r--r-- | calendar/gui/tasks-control.c | 4 |
8 files changed, 24 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e87b28afe7..49c96cada3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,21 @@ 2004-10-07 JP Rosevear <jpr@novell.com> + * gui/print.c: guard config.h + + * gui/tasks-control.c: guard config.h, remove useless include + + * gui/migration.c: remove useless include + + * gui/main.c: remove useless include + + * gui/e-calendar-view.h: #define the type + + * gui/calendar-offline-handler.c: remove useless include + + * gui/calendar-config.c: tidy header + +2004-10-07 JP Rosevear <jpr@novell.com> + * gui/calendar-commands.c: guard config.h include, kill warning and remove useless include diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index e0b10dd87e..f82fe344f7 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -1,12 +1,10 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - /* * Authors : * Damon Chaplin <damon@ximian.com> * Rodrigo Moya <rodrigo@ximian.com> * - * Copyright 2000, Ximian, Inc. - * Copyright 2000, Ximian, Inc. + * Copyright 2000-2004, Novell, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c index 99257c3ca7..0e6ba290cf 100644 --- a/calendar/gui/calendar-offline-handler.c +++ b/calendar/gui/calendar-offline-handler.c @@ -30,7 +30,6 @@ #include <gtk/gtksignal.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-i18n.h> -#include <gal/util/e-util.h> #include "e-util/e-url.h" #include <libecal/e-cal.h> #include "calendar-offline-handler.h" diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 724833c1a4..8335352976 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -35,6 +35,7 @@ G_BEGIN_DECLS * EView - base widget class for the calendar views. */ +#define E_TYPE_CALENDAR_VIEW (e_calendar_view_get_type ()) #define E_CALENDAR_VIEW(obj) GTK_CHECK_CAST (obj, e_calendar_view_get_type (), ECalendarView) #define E_CALENDAR_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_calendar_view_get_type (), ECalendarViewClass) #define E_IS_CALENDAR_VIEW(obj) GTK_CHECK_TYPE (obj, e_calendar_view_get_type ()) diff --git a/calendar/gui/main.c b/calendar/gui/main.c index ecfa80bb5a..a23b44c437 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -34,8 +34,6 @@ #include <bonobo/bonobo-shlib-factory.h> #include <bonobo/bonobo-exception.h> -#include <gal/widgets/e-cursors.h> - #include "dialogs/cal-prefs-dialog.h" #include "calendar-commands.h" #include "calendar-config.h" diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index fa1b4bdeeb..de43d4bb5f 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -40,7 +40,6 @@ #include <gtk/gtkmain.h> #include <gtk/gtklabel.h> #include <gtk/gtkprogressbar.h> -#include <gal/util/e-util.h> #include <libecal/e-cal.h> #include <e-util/e-bconf-map.h> #include <e-util/e-folder-map.h> diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 446a391548..34b7cb00b3 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -22,7 +22,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <sys/stat.h> #include <sys/time.h> #include <math.h> diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 7159d94b3a..36b8f0f07e 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -21,7 +21,10 @@ * Ettore Perazzoli */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <gtk/gtksignal.h> #include <gtk/gtklabel.h> #include <gtk/gtkcheckbutton.h> @@ -40,7 +43,6 @@ #include <libgnomeprintui/gnome-print-dialog.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-ui-util.h> -#include <gal/widgets/e-gui-utils.h> #include <e-util/e-dialog-utils.h> #include "dialogs/cal-prefs-dialog.h" #include "calendar-config.h" |