aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/Makefile.am3
-rw-r--r--calendar/gui/e-day-view-time-item.c1
-rw-r--r--calendar/gui/gnome-cal.c1
-rw-r--r--calendar/gui/prop.c7
5 files changed, 17 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fb95044145..b41a4471f2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-23 JP Rosevear <jpr@helixcode.com>
+
+ * gui/e-day-view-time-item.c: Include gnome.h for gettext purposes
+
+ * gui/gnome-cal.c: ditto
+
+ * gui/prop.c: #if out some alarm stuff
+
2000-08-23 Federico Mena Quintero <federico@helixcode.com>
* gui/e-calendar-table.c (e_calendar_table_init): Updated
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 82accbfda5..eabf812a90 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,2 +1,3 @@
-SUBDIRS = idl cal-util pcs cal-client
+#SUBDIRS = idl cal-util pcs cal-client
#SUBDIRS = idl cal-util pcs cal-client gui conduits
+SUBDIRS = idl cal-util pcs cal-client gui
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index c2dcf55727..105c85d31e 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#include <gnome.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkradiomenuitem.h>
#include "e-day-view-time-item.h"
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 01d84eb472..4713a394fe 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -8,6 +8,7 @@
*/
#include <config.h>
+#include <gnome.h>
#include <unistd.h>
#include <signal.h>
#include <sys/wait.h>
diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c
index 2555059af8..f08280b69d 100644
--- a/calendar/gui/prop.c
+++ b/calendar/gui/prop.c
@@ -70,10 +70,12 @@ static void to_cb_changed (GtkWidget* object, gpointer data);
static void snooze_cb_changed (GtkWidget* object, gpointer data);
GtkWidget* make_spin_button (int val, int low, int high);
+#if 0
void ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm,
enum AlarmType type, int y, gboolean sens,
GtkSignalFunc dirty_func);
void ee_store_alarm (CalendarAlarm *alarm, enum AlarmType type);
+#endif
/* Callback used when the property box is closed -- just sets the prop_win variable to null. */
static int
@@ -862,7 +864,8 @@ create_alarm_page (void)
FALSE, prop_changed);
*/
}
-
+
+#if 0
static void
prop_store_alarm_default_values (CalendarAlarm* alarm)
{
@@ -889,10 +892,10 @@ prop_store_alarm_default_values (CalendarAlarm* alarm)
gnome_config_set_int ("units", alarm->units);
if (alarm->data)
gnome_config_set_string ("data", alarm->data);
-
gnome_config_pop_prefix ();
gnome_config_sync ();
}
+#endif
#if 0
static void