From 5042624f2524e3621c4f90aca2c77ee415d1c5f7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 22 May 2007 07:43:42 +0000 Subject: [PATCH] Move e_cal_view_new to e-cal-view-private.h because it's an internal 2007-05-22 Ross Burton * libecal/Makefile.am: * libecal/e-cal.c: * libecal/e-cal-view.c: * libecal/e-cal-view.h: * libecal/e-cal-view-private.h: * libecal/e-cal-listener.h: * libecal/e-cal-view-listener.h: Move e_cal_view_new to e-cal-view-private.h because it's an internal function, don't install the listener headers, and sanitise includes so that the installed headers don't mention Bonobo (#438727). svn path=/trunk/; revision=7772 --- calendar/ChangeLog | 14 +++++++++++++ calendar/libecal/Makefile.am | 5 +---- calendar/libecal/e-cal-listener.h | 3 ++- calendar/libecal/e-cal-view-listener.h | 3 ++- calendar/libecal/e-cal-view-private.h | 36 ++++++++++++++++++++++++++++++++++ calendar/libecal/e-cal-view.c | 1 + calendar/libecal/e-cal-view.h | 3 --- calendar/libecal/e-cal.c | 1 + 8 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 calendar/libecal/e-cal-view-private.h diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 33046cf..ed7bc1b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,17 @@ +2007-05-22 Ross Burton + + * libecal/Makefile.am: + * libecal/e-cal.c: + * libecal/e-cal-view.c: + * libecal/e-cal-view.h: + * libecal/e-cal-view-private.h: + * libecal/e-cal-listener.h: + * libecal/e-cal-view-listener.h: + Move e_cal_view_new to e-cal-view-private.h because it's an + internal function, don't install the listener headers, and + sanitise includes so that the installed headers don't mention + Bonobo (#438727). + 2007-05-16 Jules Colding * backends/groupwise/e-cal-backend-groupwise.c (fetch_attachments): diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am index 24eb8c1..23d04d5 100644 --- a/calendar/libecal/Makefile.am +++ b/calendar/libecal/Makefile.am @@ -62,16 +62,13 @@ libecal_1_2_la_LDFLAGS = \ libecalincludedir = $(privincludedir)/libecal libecalinclude_HEADERS = \ - $(CORBA_GENERATED_H) \ e-cal.h \ e-cal-component.h \ - e-cal-listener.h \ e-cal-recur.h \ e-cal-time-util.h \ e-cal-types.h \ e-cal-util.h \ - e-cal-view.h \ - e-cal-view-listener.h + e-cal-view.h %-$(API_VERSION).pc: %.pc cp $< $@ diff --git a/calendar/libecal/e-cal-listener.h b/calendar/libecal/e-cal-listener.h index 329db7b..2254916 100644 --- a/calendar/libecal/e-cal-listener.h +++ b/calendar/libecal/e-cal-listener.h @@ -22,9 +22,10 @@ #define E_CAL_LISTENER_H #include -#include #include +#include "Evolution-DataServer-Calendar.h" + G_BEGIN_DECLS diff --git a/calendar/libecal/e-cal-view-listener.h b/calendar/libecal/e-cal-view-listener.h index 54f7620..abe37d3 100644 --- a/calendar/libecal/e-cal-view-listener.h +++ b/calendar/libecal/e-cal-view-listener.h @@ -22,9 +22,10 @@ #define E_CAL_VIEW_LISTENER_H #include -#include #include +#include "Evolution-DataServer-Calendar.h" + G_BEGIN_DECLS #define E_TYPE_CAL_VIEW_LISTENER (e_cal_view_listener_get_type ()) diff --git a/calendar/libecal/e-cal-view-private.h b/calendar/libecal/e-cal-view-private.h new file mode 100644 index 0000000..2c6dda8 --- /dev/null +++ b/calendar/libecal/e-cal-view-private.h @@ -0,0 +1,36 @@ +/* Evolution calendar - Live view client object + * + * Copyright (C) 2001 Ximian, Inc. + * + * Author: Federico Mena-Quintero + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef E_CAL_VIEW_PRIVATE_H +#define E_CAL_VIEW_PRIVATE_H + +#include +#include +#include + +#include "Evolution-DataServer-Calendar.h" + +G_BEGIN_DECLS + +ECalView *e_cal_view_new (GNOME_Evolution_Calendar_CalView corba_view, ECalViewListener *listener, struct _ECal *client); + +G_END_DECLS + +#endif diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c index bec008e..97c3097 100644 --- a/calendar/libecal/e-cal-view.c +++ b/calendar/libecal/e-cal-view.c @@ -28,6 +28,7 @@ #include "e-cal.h" #include "e-cal-view.h" #include "e-cal-view-listener.h" +#include "e-cal-view-private.h" diff --git a/calendar/libecal/e-cal-view.h b/calendar/libecal/e-cal-view.h index bd0e4cf..26b0966 100644 --- a/calendar/libecal/e-cal-view.h +++ b/calendar/libecal/e-cal-view.h @@ -22,9 +22,7 @@ #define E_CAL_VIEW_H #include -#include #include -#include G_BEGIN_DECLS @@ -59,7 +57,6 @@ struct _ECalViewClass { GType e_cal_view_get_type (void); -ECalView *e_cal_view_new (GNOME_Evolution_Calendar_CalView corba_view, ECalViewListener *listener, struct _ECal *client); struct _ECal *e_cal_view_get_client (ECalView *view); void e_cal_view_start (ECalView *view); diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c index f02a5ff..1f63ad9 100644 --- a/calendar/libecal/e-cal.c +++ b/calendar/libecal/e-cal.c @@ -38,6 +38,7 @@ #include "e-cal-time-util.h" #include "e-cal-listener.h" #include "e-cal-view-listener.h" +#include "e-cal-view-private.h" #include "e-cal.h" -- 2.7.4