aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-util
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2002-11-02 08:26:06 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2002-11-02 08:26:06 +0800
commitb87002d69794ef55c90b21b9ee7ca58e40a64960 (patch)
tree7fa81487308b1372301d8c4531065d41fd7ddf45 /calendar/cal-util
parent793f838a7be8618034e8544ca364c0f09457f316 (diff)
downloadgsoc2013-evolution-b87002d69794ef55c90b21b9ee7ca58e40a64960.tar
gsoc2013-evolution-b87002d69794ef55c90b21b9ee7ca58e40a64960.tar.gz
gsoc2013-evolution-b87002d69794ef55c90b21b9ee7ca58e40a64960.tar.bz2
gsoc2013-evolution-b87002d69794ef55c90b21b9ee7ca58e40a64960.tar.lz
gsoc2013-evolution-b87002d69794ef55c90b21b9ee7ca58e40a64960.tar.xz
gsoc2013-evolution-b87002d69794ef55c90b21b9ee7ca58e40a64960.tar.zst
gsoc2013-evolution-b87002d69794ef55c90b21b9ee7ca58e40a64960.zip
cal-client/cal-listener.h
2002-10-31 Rodrigo Moya <rodrigo@ximian.com> * cal-util/cal-component.[ch]: * cal-util/cal-recur.h: * cal-util/cal-util.[ch]: * cal-client/cal-client.h: * cal-client/cal-client-multi.h: * cal-client/cal-client-types.[ch]: * cal-client/cal-listener.h * cal-client/cal-query.[ch]: * cal-client/query-listener.h: * pcs/cal.h: * pcs/cal-backend.[ch]: * pcs/cal-backend-file.h: * pcs/cal-backend-util.h: * pcs/cal-common.h: * pcs/cal-factory.h: * pcs/query.[ch]: * pcs/query-backend.[ch]: started GNOME 2 porting. cal-util, cal-client and pcs compiled ok. * cal-client/cal-client.c (cal_client_construct): * pcs/cal-factory.c: use b-a instead of OAF and bonobo-config instead of bonobo-conf. svn path=/trunk/; revision=18496
Diffstat (limited to 'calendar/cal-util')
-rw-r--r--calendar/cal-util/cal-component.c1
-rw-r--r--calendar/cal-util/cal-component.h6
-rw-r--r--calendar/cal-util/cal-recur.h5
-rw-r--r--calendar/cal-util/cal-util.c1
-rw-r--r--calendar/cal-util/cal-util.h5
5 files changed, 7 insertions, 11 deletions
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index 197ba81a21..b16a5d2f45 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <glib.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include "cal-component.h"
#include "timeutil.h"
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
index 0c0579c48e..7a52414ce3 100644
--- a/calendar/cal-util/cal-component.h
+++ b/calendar/cal-util/cal-component.h
@@ -22,12 +22,12 @@
#ifndef CAL_COMPONENT_H
#define CAL_COMPONENT_H
-#include <libgnome/gnome-defs.h>
+#include <glib/gmacros.h>
#include <time.h>
#include <gtk/gtkobject.h>
#include <ical.h>
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
@@ -438,6 +438,6 @@ icalcomponent *cal_component_alarm_get_icalcomponent (CalComponentAlarm *alarm);
-END_GNOME_DECLS
+G_END_DECLS
#endif
diff --git a/calendar/cal-util/cal-recur.h b/calendar/cal-util/cal-recur.h
index 6ffeb2cb8a..5e1e21f1f4 100644
--- a/calendar/cal-util/cal-recur.h
+++ b/calendar/cal-util/cal-recur.h
@@ -23,11 +23,10 @@
#ifndef CAL_RECUR_H
#define CAL_RECUR_H
-#include <libgnome/gnome-defs.h>
#include <glib.h>
#include <cal-util/cal-component.h>
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
typedef gboolean (* CalRecurInstanceFn) (CalComponent *comp,
time_t instance_start,
@@ -64,6 +63,6 @@ void cal_recur_generate_instances (CalComponent *comp,
gpointer tz_cb_data,
icaltimezone *default_timezone);
-END_GNOME_DECLS
+G_END_DECLS
#endif
diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c
index d4a86e1a8f..cf7d12be98 100644
--- a/calendar/cal-util/cal-util.c
+++ b/calendar/cal-util/cal-util.c
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include "cal-util.h"
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
index e1afc1c3a0..a4d95a3e8c 100644
--- a/calendar/cal-util/cal-util.h
+++ b/calendar/cal-util/cal-util.h
@@ -22,14 +22,13 @@
#ifndef CAL_UTIL_H
#define CAL_UTIL_H
-#include <libgnome/gnome-defs.h>
#include <ical.h>
#include <time.h>
#include <glib.h>
#include <cal-util/cal-component.h>
#include <cal-util/cal-recur.h>
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
@@ -88,7 +87,7 @@ char *cal_util_expand_uri (char *uri, gboolean tasks);
void cal_util_add_timezones_from_component (icalcomponent *vcal_comp,
CalComponent *comp);
-END_GNOME_DECLS
+G_END_DECLS
#endif