aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Alves <alves@src.gnome.org>2000-03-30 23:46:31 +0800
committerSeth Alves <alves@src.gnome.org>2000-03-30 23:46:31 +0800
commitf43f0eafa8ac329a029ed58f41ac570cfcfadcaf (patch)
tree3223b0717ae740b5284a860e9cb2ba6538cecee5
parentbd040ea1426083dd6b5b43482ce45ed540c8041c (diff)
downloadgsoc2013-evolution-f43f0eafa8ac329a029ed58f41ac570cfcfadcaf.tar.gz
gsoc2013-evolution-f43f0eafa8ac329a029ed58f41ac570cfcfadcaf.tar.zst
gsoc2013-evolution-f43f0eafa8ac329a029ed58f41ac570cfcfadcaf.zip
readded the gui directory
* Makefile.am (SUBDIRS): readded the gui directory * gui/main.c: temporarily added alarm_defaults back in, since the calendar doesn't link without it svn path=/trunk/; revision=2254
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/Makefile.am2
-rw-r--r--calendar/gui/main.c9
3 files changed, 16 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a960ec7d99..13f80df470 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-30 Seth Alves <alves@hungry.com>
+
+ * Makefile.am (SUBDIRS): readded the gui directory
+
+ * gui/main.c: temporarily added alarm_defaults back in,
+ since the calendar doesn't link without it
+
2000-03-29 Matt Loper <matt@helixcode.com>
* Makefile.am: remove the gui directory, which doesn't compile.
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index c84efe5eeb..e173063a48 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1 +1 @@
-SUBDIRS = doc idl cal-util pcs cal-client # gui
+SUBDIRS = doc idl cal-util pcs cal-client gui
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index ff5103ff5f..b46e67bda8 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -101,7 +101,14 @@ const guint MAX_SNOOZE_SECS = 3600;
gboolean enable_snooze = 0;
guint snooze_secs = 60;
-extern CalendarAlarm alarm_defaults[4];
+/*extern CalendarAlarm alarm_defaults[4];*/
+CalendarAlarm alarm_defaults[4] = {
+ { ALARM_MAIL, 0, 15, ALARM_MINUTES },
+ { ALARM_PROGRAM, 0, 15, ALARM_MINUTES },
+ { ALARM_DISPLAY, 0, 15, ALARM_MINUTES },
+ { ALARM_AUDIO, 0, 15, ALARM_MINUTES }
+};
+
static void
init_username (void)