aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/Makefile.am57
-rw-r--r--calendar/gui/calendar-pilot-sync.c3
2 files changed, 29 insertions, 31 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 969fd2e3ac..586a39139d 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -2,14 +2,13 @@ SUBDIRS = dialogs
help_base = $(datadir)/gnome/help/cal
-# if HAVE_GNOME_PILOT
-#CPS = calendar-pilot-sync #empty-pilot-calendar
-# else
-#CPS =
-# endif
+if HAVE_GNOME_PILOT
+CPS = calendar-pilot-sync
+else
+CPS =
+endif
-# bin_PROGRAMS = evolution-calendar $(CPS)
-bin_PROGRAMS = evolution-calendar
+bin_PROGRAMS = evolution-calendar $(CPS)
CPPFLAGS = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
@@ -47,8 +46,6 @@ glade_DATA = \
glade_messages = event-editor-dialog.glade.h
-# calendar-conduit-control-applet
-
evolution_calendar_SOURCES = \
alarm.c \
alarm.h \
@@ -107,25 +104,25 @@ evolution_calendar_LDADD = \
evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
-# if HAVE_GNOME_PILOT
-
-# calendar_pilot_sync_SOURCES = \
-# calendar-pilot-sync.c
-#
-# calendar_pilot_sync_INCLUDES = \
-# $(INCLUDES) \
-# $(GNOME_PILOT_CFLAGS) \
-# $(PISOCK_INCLUDEDIR) \
-# $(GNOME_CONDUIT_INCLUDEDIR)
-#
-# calendar_pilot_sync_LDADD = -lpisock \
-# $(BONOBO_VFS_GNOME_LIBS) \
-# $(LINK_FLAGS) \
-# $(EXTRA_GNOME_LIBS) \
-# $(BONOBO_HTML_GNOME_LIBS) \
-# $(GNOME_PILOT_LIBS) \
-# $(PISOCK_LIBS)
-# endif
+if HAVE_GNOME_PILOT
+calendar_pilot_sync_SOURCES = \
+ calendar-pilot-sync.c
+
+calendar_pilot_sync_INCLUDES = \
+ $(INCLUDES) \
+ $(GNOME_PILOT_CFLAGS) \
+ $(PISOCK_INCLUDEDIR) \
+ $(GNOME_CONDUIT_INCLUDEDIR)
+
+calendar_pilot_sync_LDADD = -lpisock \
+ $(BONOBO_VFS_GNOME_LIBS) \
+ $(LINK_FLAGS) \
+ $(EXTRA_GNOME_LIBS) \
+ $(BONOBO_HTML_GNOME_LIBS) \
+ $(GNOME_PILOT_LIBS) \
+ $(PISOCK_LIBS)
+endif
+
if USING_OAF
oafdir = $(datadir)/oaf
@@ -148,11 +145,13 @@ EXTRA_DIST = \
monthview.xpm \
yearview.xpm \
calendar-control.gnorba \
- calendar-control.oafinfo
+ calendar-control.oafinfo \
+ gnomecal.conduit
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(help_base)/C
+ $(mkinstalldirs) $(Conduitsdir)
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/calendar/gui/calendar-pilot-sync.c b/calendar/gui/calendar-pilot-sync.c
index d9f44c14cb..c8cd574608 100644
--- a/calendar/gui/calendar-pilot-sync.c
+++ b/calendar/gui/calendar-pilot-sync.c
@@ -747,8 +747,7 @@ gnome_calendar_load_cb (GtkWidget *cal_client,
printf ("<Syncing>\n");
sync_pilot (client, *link);
printf ("</Syncing>\n");
- }
- else {
+ } else {
if (tried) {
printf ("load and create of calendar failed\n");
return;