aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog14
-rw-r--r--calendar/gui/Makefile.am7
-rw-r--r--calendar/gui/calendar-model.h2
-rw-r--r--calendar/gui/check-filled.xpm21
-rw-r--r--calendar/gui/dialogs/task-editor.c2
-rw-r--r--calendar/gui/e-calendar-table.c10
-rw-r--r--calendar/gui/e-day-view.c6
-rw-r--r--calendar/gui/e-week-view-event-item.c2
-rw-r--r--calendar/gui/e-week-view.c6
-rw-r--r--calendar/gui/event-editor.c2
-rw-r--r--calendar/gui/gncal-todo.c2
-rw-r--r--calendar/gui/gnome-cal.c4
-rw-r--r--calendar/gui/main.c2
-rw-r--r--calendar/gui/print.c2
14 files changed, 58 insertions, 24 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 9df9705ffd..3838986f93 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,17 @@
+2000-09-18 Christopher James Lahey <clahey@helixcode.com>
+
+ * gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
+ $(EXTRA_GNOME_LIBS). Removed unneeded libraries.
+
+ * gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
+ gui/e-week-view-event-item.c, gui/e-week-view.c,
+ gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
+ gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
+ to deal properly with gal.
+
+ * gui/check-filled.xpm: New file since we can't include it from
+ e-table anymore.
+
2000-09-16 Michael Meeks <michael@helixcode.com>
* gui/Makefile.am (INCLUDES): add datadir
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 37a1aa3259..8e01952739 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -18,19 +18,18 @@ INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(includedir) \
$(BONOBO_VFS_GNOME_CFLAGS) \
+ $(EXTRA_GNOME_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
LINK_FLAGS = \
$(BONOBO_VFS_GNOME_LIBS) \
+ $(EXTRA_GNOME_LIBS) \
$(INTLLIBS) \
dialogs/libcal-dialogs.a \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
- $(top_builddir)/widgets/e-paned/libepaned.a \
- $(top_builddir)/widgets/e-text/libetext.a \
- $(top_builddir)/widgets/e-table/libetable.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
@@ -95,7 +94,6 @@ evolution_calendar_LDADD = \
$(top_builddir)/shell/libeshell.a \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
- $(top_builddir)/widgets/e-text/libetext.a \
$(top_builddir)/e-util/libeutil.la \
$(LINK_FLAGS)
@@ -107,6 +105,7 @@ oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo
EXTRA_DIST = \
$(glade_DATA) \
bell.xpm \
+ check-filled.xpm \
dayview.xpm \
jump.xpm \
monthview.xpm \
diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h
index aeb50b45e6..3a1685e90c 100644
--- a/calendar/gui/calendar-model.h
+++ b/calendar/gui/calendar-model.h
@@ -23,7 +23,7 @@
#define CALENDAR_MODEL_H
#include <libgnome/gnome-defs.h>
-#include <e-table/e-table-model.h>
+#include <gal/e-table/e-table-model.h>
#include <cal-client/cal-client.h>
BEGIN_GNOME_DECLS
diff --git a/calendar/gui/check-filled.xpm b/calendar/gui/check-filled.xpm
new file mode 100644
index 0000000000..c0468fc25b
--- /dev/null
+++ b/calendar/gui/check-filled.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static const char * check_filled_xpm[] = {
+"16 16 2 1",
+" c None",
+". c #000000",
+" ",
+" ",
+" ............ ",
+" . . ",
+" . . . ",
+" . .. . ",
+" . ... . ",
+" . . ... . ",
+" . .. ... . ",
+" . ..... . ",
+" . ... . ",
+" . . . ",
+" . . ",
+" ............ ",
+" ",
+" "};
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 08d76a14be..8a7a93d212 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -30,7 +30,7 @@
#include <config.h>
#include <gnome.h>
#include <glade/glade.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
#include <e-util/e-dialog-widgets.h>
#include <widgets/misc/e-dateedit.h>
#include <cal-util/timeutil.h>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index ab1578508e..3d72b8f18a 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -29,10 +29,10 @@
#include <config.h>
#include <gnome.h>
-#include <e-table/e-table-scrolled.h>
-#include <e-table/e-cell-checkbox.h>
-#include <e-table/e-cell-toggle.h>
-#include <e-table/e-cell-text.h>
+#include <gal/e-table/e-table-scrolled.h>
+#include <gal/e-table/e-cell-checkbox.h>
+#include <gal/e-table/e-cell-toggle.h>
+#include <gal/e-table/e-cell-text.h>
#include "e-calendar-table.h"
#include "calendar-model.h"
#include "dialogs/task-editor.h"
@@ -43,7 +43,7 @@
#include "task-assigned.xpm"
#include "task-assigned-to.xpm"
-#include <e-table/check-filled.xpm>
+#include "check-filled.xpm"
static void e_calendar_table_class_init (ECalendarTableClass *class);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index ccf94b6e34..af402722cd 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -38,9 +38,9 @@
#include "e-day-view-main-item.h"
#include "calendar-commands.h"
#include "popup-menu.h"
-#include "../e-util/e-canvas.h"
-#include "../widgets/e-text/e-text.h"
-#include "e-util/e-canvas-utils.h"
+#include <gal/widgets/e-canvas.h>
+#include <gal/e-text/e-text.h>
+#include <gal/widgets/e-canvas-utils.h>
/* Images */
#include "bell.xpm"
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index c4e3eb4c7d..8f221bd17f 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -29,7 +29,7 @@
*/
#include <config.h>
-#include "../widgets/e-text/e-text.h"
+#include <gal/e-text/e-text.h>
#include "e-week-view-event-item.h"
static void e_week_view_event_item_class_init (EWeekViewEventItemClass *class);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index fbc3bfb731..580941b8bd 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -38,9 +38,9 @@
#include "e-week-view-titles-item.h"
#include <cal-util/timeutil.h>
#include "popup-menu.h"
-#include "../e-util/e-canvas.h"
-#include "../widgets/e-text/e-text.h"
-#include "e-util/e-canvas-utils.h"
+#include <gal/widgets/e-canvas.h>
+#include <gal/e-text/e-text.h>
+#include <gal/widgets/e-canvas-utils.h>
/* Images */
#include "bell.xpm"
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index 3f6efd1bb0..fe9005358f 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -26,7 +26,7 @@
#include <glade/glade.h>
#include <e-util/e-dialog-widgets.h>
#include <widgets/misc/e-dateedit.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
#include <cal-util/timeutil.h>
#include "event-editor.h"
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
index 239517ff3b..bf03383769 100644
--- a/calendar/gui/gncal-todo.c
+++ b/calendar/gui/gncal-todo.c
@@ -7,7 +7,7 @@
#include <config.h>
#include <gnome.h>
-#include "e-util/e-unicode.h"
+#include <gal/widgets/e-unicode.h>
#include "event-editor.h"
#include "gncal-todo.h"
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index f6d8742b4a..876af5fe28 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -14,8 +14,8 @@
#include <sys/wait.h>
#include <fcntl.h>
#include <gnome.h>
-#include <widgets/e-paned/e-hpaned.h>
-#include <widgets/e-paned/e-vpaned.h>
+#include <gal/e-paned/e-hpaned.h>
+#include <gal/e-paned/e-vpaned.h>
#include <cal-util/timeutil.h>
#include "dialogs/alarm-notify-dialog.h"
#include "alarm.h"
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 63bca2c9f2..4474a64d8b 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -33,7 +33,7 @@
#include <liboaf/liboaf.h>
-#include <e-util/e-cursors.h>
+#include <gal/widgets/e-cursors.h>
#include <cal-util/timeutil.h>
#include <gui/alarm.h>
#include <gui/gnome-cal.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 0bb4e73f35..12473d3712 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -31,7 +31,7 @@
#include <libgnomeprint/gnome-print-preview.h>
#include <libgnomeprint/gnome-printer-dialog.h>
#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
#include <cal-util/timeutil.h>
#include "calendar-commands.h"
#include "gnome-cal.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 03:43:30 +0800