aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/Makefile.am29
-rw-r--r--calendar/gui/alarm-notify/alarm.c2
-rw-r--r--calendar/gui/alarm-notify/alarm.h2
-rw-r--r--calendar/gui/alarm.c2
-rw-r--r--calendar/gui/alarm.h2
-rw-r--r--calendar/gui/corba-cal-factory.c2
-rw-r--r--calendar/gui/corba-cal.c2
-rw-r--r--calendar/gui/eventedit.c2
-rw-r--r--calendar/gui/gncal-day-panel.c2
-rw-r--r--calendar/gui/gncal-day-view.c2
-rw-r--r--calendar/gui/gncal-week-view.c2
-rw-r--r--calendar/gui/gncal.desktop37
-rw-r--r--calendar/gui/goto.c2
-rw-r--r--calendar/gui/mark.c2
-rw-r--r--calendar/gui/month-view.c2
-rw-r--r--calendar/gui/view-utils.h3
-rw-r--r--calendar/gui/year-view.c2
17 files changed, 27 insertions, 70 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index d51e5a5986..2f0dab260a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -6,8 +6,8 @@ help_base = $(datadir)/gnome/help/cal
# calendar-pilot-sync
#endif
-
INCLUDES = \
+ -DG_LOG_DOMAIN=\"calendar-gui\" \
-I$(top_srcdir) \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/libical/src/libical \
@@ -17,18 +17,18 @@ INCLUDES = \
$(PISOCK_INCLUDEDIR) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-LINK_FLAGS = \
- $(BONOBO_VFS_GNOME_LIBS) \
- $(INTLLIBS) \
- $(top_builddir)/calendar/cal-util/libcalutil.la \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a \
- $(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical.la \
- $(top_builddir)/calendar/cal-client/libcal-client.la
+LINK_FLAGS = \
+ $(BONOBO_VFS_GNOME_LIBS) \
+ $(INTLLIBS) \
+ $(top_builddir)/calendar/cal-client/libcal-client.la \
+ $(top_builddir)/calendar/cal-util/libcal-util.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/libversit/libversit.la \
+ $(top_builddir)/libical/src/libical/libical.la
bin_PROGRAMS = evolution-calendar
+
evolution_calendar_SOURCES = \
alarm.c \
alarm.h \
@@ -182,8 +182,7 @@ gnorba_DATA = calendar-control.gnorba
#Conduits_second_DATA = $(Conduits_DATA)
#endif
-EXTRA_DIST = \
- gncal.desktop \
+EXTRA_DIST = \
bell.xpm \
recur.xpm
@@ -196,10 +195,6 @@ EXTRA_DIST = \
#appicondir = $(datadir)/pixmaps
#appicon_DATA = gnome-calendar-conduit.png
-Productivitydir = $(datadir)/gnome/apps/Applications
-
-Productivity_DATA = gncal.desktop
-
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(help_base)/C
# $(mkinstalldirs) $(Conduitsdir)
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 88bf5a6848..ae76a0ce73 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -11,7 +11,7 @@
#include <fcntl.h>
#include <signal.h>
#include <sys/time.h>
-#include "cal-util/calobj.h"
+#include <cal-util/calobj.h>
#include "alarm.h"
/* The pipes used to notify about an alarm */
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index c1dbd9cb61..efdfda997d 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -2,7 +2,7 @@
#define ALARM_H
#include <time.h>
-#include "cal-util/calobj.h"
+#include <cal-util/calobj.h>
typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse);
diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c
index 88bf5a6848..ae76a0ce73 100644
--- a/calendar/gui/alarm.c
+++ b/calendar/gui/alarm.c
@@ -11,7 +11,7 @@
#include <fcntl.h>
#include <signal.h>
#include <sys/time.h>
-#include "cal-util/calobj.h"
+#include <cal-util/calobj.h>
#include "alarm.h"
/* The pipes used to notify about an alarm */
diff --git a/calendar/gui/alarm.h b/calendar/gui/alarm.h
index c1dbd9cb61..efdfda997d 100644
--- a/calendar/gui/alarm.h
+++ b/calendar/gui/alarm.h
@@ -2,7 +2,7 @@
#define ALARM_H
#include <time.h>
-#include "cal-util/calobj.h"
+#include <cal-util/calobj.h>
typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse);
diff --git a/calendar/gui/corba-cal-factory.c b/calendar/gui/corba-cal-factory.c
index 591c486f62..07a7008db0 100644
--- a/calendar/gui/corba-cal-factory.c
+++ b/calendar/gui/corba-cal-factory.c
@@ -11,7 +11,7 @@
#include <sys/stat.h>
#include "gnome-cal.h"
#include "calendar-commands.h"
-#include "cal-util/timeutil.h"
+#include <cal-util/timeutil.h>
#include "libversit/vcc.h"
#include <libgnorba/gnorba.h>
#include <bonobo.h>
diff --git a/calendar/gui/corba-cal.c b/calendar/gui/corba-cal.c
index a547c2dc2b..4b203a4478 100644
--- a/calendar/gui/corba-cal.c
+++ b/calendar/gui/corba-cal.c
@@ -12,7 +12,7 @@
/*#include "calendar.h" DELETE */
#include "gnome-cal.h"
#include "alarm.h"
-#include "cal-util/timeutil.h"
+#include <cal-util/timeutil.h>
#include "libversit/vcc.h"
#include <libgnorba/gnome-factory.h>
#include "GnomeCal.h"
diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c
index b4696a8dd6..0c79bb5d92 100644
--- a/calendar/gui/eventedit.c
+++ b/calendar/gui/eventedit.c
@@ -8,9 +8,9 @@
#include <config.h>
#include <gnome.h>
#include <string.h>
+#include <cal-util/timeutil.h>
#include "eventedit.h"
#include "calendar-commands.h"
-#include "cal-util/timeutil.h"
static void event_editor_class_init (EventEditorClass *class);
diff --git a/calendar/gui/gncal-day-panel.c b/calendar/gui/gncal-day-panel.c
index 1b3b5360f8..d0556f5d94 100644
--- a/calendar/gui/gncal-day-panel.c
+++ b/calendar/gui/gncal-day-panel.c
@@ -8,9 +8,9 @@
#include <config.h>
#include <gnome.h>
#include <gtk/gtkhseparator.h>
+#include <cal-util/timeutil.h>
#include "gncal-day-panel.h"
#include "calendar-commands.h"
-#include "cal-util/timeutil.h"
guint
diff --git a/calendar/gui/gncal-day-view.c b/calendar/gui/gncal-day-view.c
index 2daa13009e..54347c52b8 100644
--- a/calendar/gui/gncal-day-view.c
+++ b/calendar/gui/gncal-day-view.c
@@ -8,7 +8,7 @@
#include <gnome.h>
#include "gncal-day-view.h"
-#include "cal-util/timeutil.h"
+#include <cal-util/timeutil.h>
#include "view-utils.h"
#include "calendar-commands.h"
#include "eventedit.h"
diff --git a/calendar/gui/gncal-week-view.c b/calendar/gui/gncal-week-view.c
index 55e956d49e..bd3091a54a 100644
--- a/calendar/gui/gncal-week-view.c
+++ b/calendar/gui/gncal-week-view.c
@@ -10,9 +10,9 @@
#include <gnome.h>
#include <string.h>
#include <gtk/gtk.h>
+#include <cal-util/timeutil.h>
#include "gncal-week-view.h"
#include "calendar-commands.h"
-#include "cal-util/timeutil.h"
static void gncal_week_view_init (GncalWeekView *wview);
diff --git a/calendar/gui/gncal.desktop b/calendar/gui/gncal.desktop
deleted file mode 100644
index 9ee2a2db9b..0000000000
--- a/calendar/gui/gncal.desktop
+++ /dev/null
@@ -1,37 +0,0 @@
-[Desktop Entry]
-Name=Calendar
-Name[da]=Kalender
-Name[de]=Kalender
-Name[el]=Çìåñïëüãéï
-Name[es]=Calendario
-Name[et]=Kalender
-Name[fi]=Kalenteri
-Name[fr]=Calendrier
-Name[gl]=Axenda
-Name[ja]=¥«¥ì¥ó¥À¡¼
-Name[ko]=´Þ·Â
-Name[no]=Kalender
-Name[pt]=Agenda
-Name[pt_BR]=Calendário
-Name[ru]=ëÁÌÅÎÄÁÒØ
-Name[sv]=Kalender
-Comment=Calendar application
-Comment[da]=Gnome Kalender
-Comment[de]=Gnome Kalender
-Comment[el]=Çìåñïëüãéï ôïõ Gnome
-Comment[es]=Calendario de Gnome
-Comment[et]=GNOME kalender
-Comment[fi]=GNOME-kalenteri
-Comment[fr]=Calendrier GNOME
-Comment[gl]=Axenda de GNOME
-Comment[ja]=GNOME¥«¥ì¥ó¥À¡¼
-Comment[ko]=±×³ð ´Þ·Â
-Comment[no]=Gnome Kalender
-Comment[pt]=Agenda Gnome
-Comment[pt_BR]=Calendário GNOME
-Comment[ru]=ëÁÌÅÎÄÁÒØ Gnome
-Comment[sv]=Gnome-kalender
-Exec=gnomecal
-Icon=gnome-calendar.png
-Terminal=0
-Type=Application
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index c6399aabb3..1e7bc474ba 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -7,11 +7,11 @@
#include <config.h>
#include <gnome.h>
+#include <cal-util/timeutil.h>
#include "gnome-cal.h"
#include "gnome-month-item.h"
#include "calendar-commands.h"
#include "mark.h"
-#include "cal-util/timeutil.h"
static GtkWidget *goto_win; /* The goto dialog window */
diff --git a/calendar/gui/mark.c b/calendar/gui/mark.c
index a868123545..02b3af17e1 100644
--- a/calendar/gui/mark.c
+++ b/calendar/gui/mark.c
@@ -6,10 +6,10 @@
*/
#include <config.h>
+#include <cal-util/timeutil.h>
#include "gnome-cal.h"
#include "calendar-commands.h"
#include "mark.h"
-#include "cal-util/timeutil.h"
/* Frees the specified data when an object is destroyed */
diff --git a/calendar/gui/month-view.c b/calendar/gui/month-view.c
index 449892fb17..6ac8c035bc 100644
--- a/calendar/gui/month-view.c
+++ b/calendar/gui/month-view.c
@@ -8,13 +8,13 @@
#include <config.h>
#include <gnome.h>
#include <libgnomeui/gnome-canvas-text.h>
+#include <cal-util/timeutil.h>
#include "eventedit.h"
#include "layout.h"
#include "month-view.h"
#include "calendar-commands.h"
#include "mark.h"
#include "quick-view.h"
-#include "cal-util/timeutil.h"
/* Spacing between title and calendar */
diff --git a/calendar/gui/view-utils.h b/calendar/gui/view-utils.h
index 4d850375fb..af9f52fec1 100644
--- a/calendar/gui/view-utils.h
+++ b/calendar/gui/view-utils.h
@@ -10,8 +10,7 @@
#include <gtk/gtk.h>
-/*#include "calendar.h"*/
-#include "cal-util/calobj.h"
+#include <cal-util/calobj.h>
enum {
diff --git a/calendar/gui/year-view.c b/calendar/gui/year-view.c
index d5c56c5633..766ad965b6 100644
--- a/calendar/gui/year-view.c
+++ b/calendar/gui/year-view.c
@@ -9,12 +9,12 @@
#include <config.h>
#include <gtk/gtkmain.h>
#include <gnome.h>
+#include <cal-util/timeutil.h>
#include "eventedit.h"
#include "year-view.h"
#include "calendar-commands.h"
#include "mark.h"
#include "quick-view.h"
-#include "cal-util/timeutil.h"
#define HEAD_SPACING 4 /* Spacing between year heading and months */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 04:27:18 +0800