update g_date calls to non-deprecated calls

2003-10-23  JP Rosevear <jpr@ximian.com>

	* cal-util/cal-recur.c: update g_date calls to non-deprecated
	calls

	* cal-util/Makefile.am: turn off deprecated funcs

	* cal-client/Makefile.am: turn off deprecated funcs

	* cal-client/cal-client.c (cal_client_get_error_message): add OK
	message

	* pcs/cal-backend.[hc]: remove dead funcs

	* pcs/query.c: tidy headers

svn path=/trunk/; revision=23035

8 files changed, 61 insertions, 71 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index aa9dc51f95..732a9196c5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,21 @@
 2003-10-23  JP Rosevear <jpr@ximian.com>
 
+	* cal-util/cal-recur.c: update g_date calls to non-deprecated
+	calls
+
+	* cal-util/Makefile.am: turn off deprecated funcs
+
+	* cal-client/Makefile.am: turn off deprecated funcs
+
+	* cal-client/cal-client.c (cal_client_get_error_message): add OK
+	message
+
+	* pcs/cal-backend.[hc]: remove dead funcs
+
+	* pcs/query.c: tidy headers
+
+2003-10-23  JP Rosevear <jpr@ximian.com>
+
 	* pcs/query.c (query_notify_objects_removed_1): Fix c/p typo -
 	call removed instead of modify
 
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index b8190fe5aa..9008c05940 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -1,6 +1,19 @@
-#
-# libcal-client
-#
+INCLUDES =						\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	-DG_LOG_DOMAIN=\"cal-client\"			\
+	-I$(top_srcdir)/calendar			\
+	-I$(srcdir) -I$(top_srcdir) 			\
+	-I. 						\
+	-I.. 						\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)/libical/src			\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
+AM_CFLAGS = 								\
+	-DGTK_DISABLE_DEPRECATED=1					\
+	-DGDK_DISABLE_DEPRECATED=1					\
+	-DG_DISABLE_DEPRECATED=1					\
+	-DGNOME_DISABLE_DEPRECATED=1
 
 CORBA_GENERATED_C =				\
 	evolution-calendar-common.c		\
@@ -20,17 +33,6 @@ $(CORBA_GENERATED_H): $(idls)
 	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
 $(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
 
-INCLUDES =						\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DG_LOG_DOMAIN=\"cal-client\"			\
-	-I$(top_srcdir)/calendar			\
-	-I$(srcdir) -I$(top_srcdir) 			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/libical/src			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
 privlib_LTLIBRARIES = libcal-client.la
 
 libcal_clientincludedir = $(privincludedir)/cal-client
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index a77d7731dd..8aea224485 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -3806,6 +3806,8 @@ cal_client_get_error_message (ECalendarStatus status)
 		return _("A CORBA esception has occurred");
 	case E_CALENDAR_STATUS_OTHER_ERROR :
 		return _("Unknown error");
+	case E_CALENDAR_STATUS_OK :
+		return _("No error");
 	}
 
 	return NULL;
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index 80eb0dc4f3..35bf23965b 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -1,5 +1,3 @@
-noinst_PROGRAMS = test-recur
-
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"cal-util\"			\
 	-I$(top_srcdir) 				\
@@ -10,6 +8,14 @@ INCLUDES =						\
 	-I$(top_srcdir)/libical/src			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
+AM_CFLAGS = 								\
+	-DGTK_DISABLE_DEPRECATED=1					\
+	-DGDK_DISABLE_DEPRECATED=1					\
+	-DG_DISABLE_DEPRECATED=1					\
+	-DGNOME_DISABLE_DEPRECATED=1
+
+noinst_PROGRAMS = test-recur
+
 #
 # cal util library
 #
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
index 123198676c..160a253730 100644
--- a/calendar/cal-util/cal-recur.c
+++ b/calendar/cal-util/cal-recur.c
@@ -20,9 +20,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
+#include <glib.h>
 #include <libgnome/gnome-i18n.h>
 #include <cal-util/cal-recur.h>
 #include <cal-util/timeutil.h>
@@ -1439,7 +1443,7 @@ cal_object_compute_duration (CalObjTime *start,
 	g_date_set_dmy (&end_date, end->day, end->month + 1,
 			end->year);
 
-	*days = g_date_julian (&end_date) - g_date_julian (&start_date);
+	*days = g_date_get_julian (&end_date) - g_date_get_julian (&start_date);
 	start_seconds = start->hour * 3600 + start->minute * 60
 		+ start->second;
 	end_seconds = end->hour * 3600 + end->minute * 60 + end->second;
@@ -2233,10 +2237,10 @@ cal_obj_weekly_find_start_position (CalObjTime *event_start,
 
 	/* Calculate the start of the weeks corresponding to the event start
 	   and interval start. */
-	event_start_julian = g_date_julian (&event_start_date);
+	event_start_julian = g_date_get_julian (&event_start_date);
 	event_start_julian -= recur_data->weekday_offset;
 
-	interval_start_julian = g_date_julian (&interval_start_date);
+	interval_start_julian = g_date_get_julian (&interval_start_date);
 	interval_start_weekday_offset = cal_obj_time_weekday_offset (interval_start, recur_data->recur);
 	interval_start_julian -= interval_start_weekday_offset;
 
@@ -2328,8 +2332,8 @@ cal_obj_daily_find_start_position  (CalObjTime *event_start,
 	g_date_set_dmy (&interval_start_date, interval_start->day,
 			interval_start->month + 1, interval_start->year);
 
-	event_start_julian = g_date_julian (&event_start_date);
-	interval_start_julian = g_date_julian (&interval_start_date);
+	event_start_julian = g_date_get_julian (&event_start_date);
+	interval_start_julian = g_date_get_julian (&interval_start_date);
 
 	if (event_start_julian < interval_start_julian) {
 		days = interval_start_julian - event_start_julian
@@ -2400,8 +2404,8 @@ cal_obj_hourly_find_start_position (CalObjTime *event_start,
 				interval_start->month + 1,
 				interval_start->year);
 
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
+		event_start_julian = g_date_get_julian (&event_start_date);
+		interval_start_julian = g_date_get_julian (&interval_start_date);
 
 		hours = (interval_start_julian - event_start_julian) * 24;
 		hours += interval_start->hour - event_start->hour;
@@ -2472,8 +2476,8 @@ cal_obj_minutely_find_start_position (CalObjTime *event_start,
 				interval_start->month + 1,
 				interval_start->year);
 
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
+		event_start_julian = g_date_get_julian (&event_start_date);
+		interval_start_julian = g_date_get_julian (&interval_start_date);
 
 		minutes = (interval_start_julian - event_start_julian)
 			* 24 * 60;
@@ -2546,8 +2550,8 @@ cal_obj_secondly_find_start_position (CalObjTime *event_start,
 				interval_start->month + 1,
 				interval_start->year);
 
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
+		event_start_julian = g_date_get_julian (&event_start_date);
+		interval_start_julian = g_date_get_julian (&interval_start_date);
 
 		seconds = (interval_start_julian - event_start_julian)
 			* 24 * 60 * 60;
@@ -3668,7 +3672,7 @@ cal_obj_time_weekday		(CalObjTime *cotime)
 	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
 
 	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
+	weekday = g_date_get_weekday (&date) - 1;
 
 	return weekday;
 }
@@ -3687,7 +3691,7 @@ cal_obj_time_weekday_offset	(CalObjTime *cotime,
 	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
 
 	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
+	weekday = g_date_get_weekday (&date) - 1;
 
 	/* This calculates the offset of our day from the start of the week.
 	   We just add on a week (to avoid any possible negative values) and
@@ -3708,7 +3712,7 @@ cal_obj_time_day_of_year		(CalObjTime *cotime)
 	g_date_clear (&date, 1);
 	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
 
-	return g_date_day_of_year (&date);
+	return g_date_get_day_of_year (&date);
 }
 
 
@@ -3727,7 +3731,7 @@ cal_obj_time_find_first_week	(CalObjTime *cotime,
 	/* Find out the weekday of the 1st of the year, 0 (Mon) - 6 (Sun). */
 	g_date_clear (&date, 1);
 	g_date_set_dmy (&date, 1, 1, cotime->year);
-	weekday = g_date_weekday (&date) - 1;
+	weekday = g_date_get_weekday (&date) - 1;
 
 	/* Calculate the first day of the year that starts a new week, i.e. the
 	   first week_start_day after weekday, using 0 = 1st Jan.
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
index ae5be6829e..3d70c192b5 100644
--- a/calendar/pcs/cal-backend.c
+++ b/calendar/pcs/cal-backend.c
@@ -816,34 +816,6 @@ cal_backend_send_objects (CalBackend *backend, Cal *cal, const char *calobj)
 }
 
 /**
- * cal_backend_opened:
- * @backend: A calendar backend.
- * @status: Open status code.
- * 
- * Emits the "opened" signal of a calendar backend.  This function is to be used
- * only by backend implementations.
- **/
-void
-cal_backend_opened (CalBackend *backend, int status)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	g_signal_emit (G_OBJECT (backend), cal_backend_signals[OPENED],
-		       0, status);
-}
-
-void
-cal_backend_removed (CalBackend *backend, int status)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	g_signal_emit (G_OBJECT (backend), cal_backend_signals[REMOVED],
-		       0, status);
-}
-
-/**
  * cal_backend_get_timezone:
  * @backend: A calendar backend.
  * @tzid: Unique identifier of a VTIMEZONE object. Note that this must not be
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
index 793622cadc..b33a2c32a0 100644
--- a/calendar/pcs/cal-backend.h
+++ b/calendar/pcs/cal-backend.h
@@ -160,10 +160,6 @@ icaltimezone* cal_backend_internal_get_timezone (CalBackend *backend, const char
 
 void cal_backend_last_client_gone (CalBackend *backend);
 
-/* FIXME what to do about status */
-void cal_backend_opened (CalBackend *backend, int status);
-void cal_backend_removed (CalBackend *backend, int status);
-
 void cal_backend_notify_mode      (CalBackend *backend,
 				   GNOME_Evolution_Calendar_Listener_SetModeStatus status, 
 				   GNOME_Evolution_Calendar_CalMode mode);
diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c
index 5b72ac5fa5..453c1cc4ce 100644
--- a/calendar/pcs/query.c
+++ b/calendar/pcs/query.c
@@ -22,18 +22,10 @@
 #include <config.h>
 #endif
 
-#include <string.h>
 #include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-i18n.h>
 #include <bonobo/bonobo-exception.h>
-#include <gal/widgets/e-unicode.h>
 #include <e-util/e-component-listener.h>
-#include <e-util/e-sexp.h>
 #include <pcs/cal-backend-object-sexp.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/timeutil.h>
-#include "cal-backend.h"
 #include "query.h"