diff options
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.h | 3 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 16 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.h | 2 |
5 files changed, 19 insertions, 15 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 08a665e3f2..8954da6c53 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2004-02-27 JP Rosevear <jpr@ximian.com> + + * gui/gnome-cal.h: remove proto + + * gui/gnome-cal.c (set_query): rename from + gnome_calendar_set_query and make static + + * gui/e-day-view.h: remove proto for dead function + + * gui/e-day-view.c: guard config.h include + 2004-02-26 Rodney Dawes <dobey@ximian.com> * gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 3ee3813f47..71f9f916be 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -26,7 +26,9 @@ * EDayView - displays the Day & Work-Week views of the calendar. */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif #include "e-day-view.h" #include "ea-calendar.h" diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index e68279d123..77721866ec 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -460,9 +460,6 @@ struct _EDayViewClass GtkType e_day_view_get_type (void); GtkWidget* e_day_view_new (void); -void e_day_view_set_query (EDayView *day_view, - const char *sexp); - /* Whether we are displaying a work-week, in which case the display always starts on the first day of the working week. */ gboolean e_day_view_get_work_week_view (EDayView *day_view); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 0ac372548e..8afd6e7186 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -25,7 +25,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <unistd.h> #include <signal.h> #include <sys/wait.h> @@ -656,15 +659,8 @@ adjust_e_cal_view_for_view (ECalendarView *cal_view, const char *sexp) g_free (real_sexp); } -/** - * gnome_calendar_set_query: - * @gcal: A calendar. - * @sexp: Sexp that defines the query. - * - * Sets the query sexp for all the views in a calendar. - **/ -void -gnome_calendar_set_query (GnomeCalendar *gcal, const char *sexp) +static void +set_query (GnomeCalendar *gcal, const char *sexp) { GnomeCalendarPrivate *priv; ECalModel *model; @@ -721,7 +717,7 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer GnomeCalendar *gcal; gcal = GNOME_CALENDAR (data); - gnome_calendar_set_query (gcal, sexp); + set_query (gcal, sexp); } /* Callback used when the selected category in the search bar changes */ diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index d63ac53f4f..e9adb85ca8 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -112,8 +112,6 @@ gboolean gnome_calendar_add_event_source (GnomeCalendar *gcal, ESource *s gboolean gnome_calendar_remove_event_source (GnomeCalendar *gcal, ESource *source); gboolean gnome_calendar_set_default_source (GnomeCalendar *gcal, ESource *source); -void gnome_calendar_set_query (GnomeCalendar *gcal, const char *sexp); - void gnome_calendar_next (GnomeCalendar *gcal); void gnome_calendar_previous (GnomeCalendar *gcal); void gnome_calendar_goto (GnomeCalendar *gcal, |