aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2003-11-24 07:58:47 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2003-11-24 07:58:47 +0800
commitf05c55fadc3b71b840fd79a4ef8d32309c82b935 (patch)
tree5ed4496351609cb1c7f33ade8edd0f38556ef8c6
parente0cc63b07902740a58e399dd07c91a9a5a1c52bb (diff)
downloadgsoc2013-evolution-f05c55fadc3b71b840fd79a4ef8d32309c82b935.tar.gz
gsoc2013-evolution-f05c55fadc3b71b840fd79a4ef8d32309c82b935.tar.zst
gsoc2013-evolution-f05c55fadc3b71b840fd79a4ef8d32309c82b935.zip
fixed compilation errors.
2003-11-23 Rodrigo Moya <rodrigo@ximian.com> * gui/dialogs/copy-dialog-source.[ch]: fixed compilation errors. * gui/dialogs/Makefile.am: added missing header directories. svn path=/trunk/; revision=23472
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/Makefile.am1
-rw-r--r--calendar/gui/dialogs/copy-source-dialog.c5
-rw-r--r--calendar/gui/dialogs/copy-source-dialog.h6
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,5 +1,11 @@
2003-11-23 Rodrigo Moya <rodrigo@ximian.com>
+ * gui/dialogs/copy-dialog-source.[ch]: fixed compilation errors.
+
+ * gui/dialogs/Makefile.am: added missing header directories.
+
+2003-11-23 Rodrigo Moya <rodrigo@ximian.com>
+
* gui/dialogs/new-calendar.[ch]: fixed copyright notices.
* gui/dialogs/copy-source-dialog.[ch]: implementation of the
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 <gtk/gtkdialog.h>
#include <gtk/gtkstock.h>
+#include <bonobo/bonobo-i18n.h>
#include <widgets/misc/e-source-selector.h>
#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 <gtk/gtkwindow.h>
-#include <e-util/e-source.h>
+#include <libedataserver/e-source.h>
+#include <libecal/e-cal.h>
+#include <libecal/e-cal-util.h>
-gboolean copy_source_dialog (GtkWindow *parent, ESource *source);
+gboolean copy_source_dialog (GtkWindow *parent, ESource *source, CalObjType obj_type);
#endif