aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/gui/gnome-cal.c5
2 files changed, 16 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b137f788fb..d90a355ae0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-04 <jpr@novell.com>
+
+ * gui/gnome-cal.c: define G_MAXINT32 if it isn't already
+
+2004-06-04 JP Rosevear <jpr@novell.com>
+
+ Fixes #58739
+
+ * gui/migration.c (migrate_calendars): guard against NULL
+ gconf_val
+
2004-06-04 JP Rosevear <jpr@novell.com>
Fixes #59058
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 63379c2d52..89f813580b 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -77,6 +77,11 @@
#include "ea-calendar.h"
#include "common/authentication.h"
+/* FIXME glib 2.4 and above has this */
+#ifndef G_MAXINT32
+#define G_MAXINT32 ((gint32) 0x7fffffff)
+#endif
+
/* Private part of the GnomeCalendar structure */