From f05c55fadc3b71b840fd79a4ef8d32309c82b935 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Sun, 23 Nov 2003 23:58:47 +0000 Subject: fixed compilation errors. 2003-11-23 Rodrigo Moya * gui/dialogs/copy-dialog-source.[ch]: fixed compilation errors. * gui/dialogs/Makefile.am: added missing header directories. svn path=/trunk/; revision=23472 --- calendar/ChangeLog | 6 ++++++ calendar/gui/dialogs/Makefile.am | 1 + calendar/gui/dialogs/copy-source-dialog.c | 5 +++-- calendar/gui/dialogs/copy-source-dialog.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0a00ace82f..7c0142aa3b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2003-11-23 Rodrigo Moya + + * gui/dialogs/copy-dialog-source.[ch]: fixed compilation errors. + + * gui/dialogs/Makefile.am: added missing header directories. + 2003-11-23 Rodrigo Moya * gui/dialogs/new-calendar.[ch]: fixed copyright notices. diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index ebf5fcf236..bd81bb4229 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -14,6 +14,7 @@ BUILT_SOURCES = $(IDL_GENERATED) INCLUDES = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/calendar \ -I$(top_srcdir)/calendar/cal-client \ -I$(top_builddir)/calendar/cal-client \ diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 39daf0c597..535f02cbd4 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -20,6 +20,7 @@ #include #include +#include #include #include "copy-source-dialog.h" @@ -91,9 +92,9 @@ copy_source (CopySourceDialogData *csdd) /* FIXME: process errors */ if (e_cal_get_object (dest_client, icalcomponent_get_uid (l->data), NULL, &icalcomp, NULL)) { - e_cal_modify_modify_object (dest_client, icalcomp, CALOBJ_MOD_ALL, NULL); + e_cal_modify_object (dest_client, icalcomp, CALOBJ_MOD_ALL, NULL); } else { - e_cal_create_object (dest_client, icalcomp, &uid, NULL); + e_cal_create_object (dest_client, icalcomp, (char **) &uid, NULL); g_free ((gpointer) uid); } } diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h index d87d841afe..e3c750d8a0 100644 --- a/calendar/gui/dialogs/copy-source-dialog.h +++ b/calendar/gui/dialogs/copy-source-dialog.h @@ -22,8 +22,10 @@ #define COPY_SOURCE_DIALOG_H #include -#include +#include +#include +#include -gboolean copy_source_dialog (GtkWindow *parent, ESource *source); +gboolean copy_source_dialog (GtkWindow *parent, ESource *source, CalObjType obj_type); #endif -- cgit v1.2.3