aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchen@src.gnome.org>2005-08-25 18:26:28 +0800
committerChenthill Palanisamy <pchen@src.gnome.org>2005-08-25 18:26:28 +0800
commita47ca156207f3cebf4b6efb276db663def030763 (patch)
tree7605c632dbed3a4ee709fa302a10b50cfc175746 /calendar
parent5ef810562c716cd4665a407b3c1015e600ea6e42 (diff)
downloadgsoc2013-evolution-a47ca156207f3cebf4b6efb276db663def030763.tar
gsoc2013-evolution-a47ca156207f3cebf4b6efb276db663def030763.tar.gz
gsoc2013-evolution-a47ca156207f3cebf4b6efb276db663def030763.tar.bz2
gsoc2013-evolution-a47ca156207f3cebf4b6efb276db663def030763.tar.lz
gsoc2013-evolution-a47ca156207f3cebf4b6efb276db663def030763.tar.xz
gsoc2013-evolution-a47ca156207f3cebf4b6efb276db663def030763.tar.zst
gsoc2013-evolution-a47ca156207f3cebf4b6efb276db663def030763.zip
Fixes 313705
svn path=/trunk/; revision=30247
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/alarm-notify/Makefile.am1
-rw-r--r--calendar/gui/alarm-notify/notify-main.c6
3 files changed, 14 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7ea2199524..82001eceb7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-24 Chenthill Palanisamy <pchenthill@novell.com>
+
+ Fixes #313705
+ * gui/alarm-notify/Makefile.am: Added CAMEL_LIBS.
+ * gui/alarm-notify/notify-main.c: (main): Initialize
+ the camel object.
+
2005-08-23 Not Zed <NotZed@Ximian.com>
* gui/e-cal-config.h: source-type is an enum not a pointer!
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 17e9444e83..8b9be3d141 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -50,6 +50,7 @@ evolution_alarm_notify_LDADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(CAMEL_LIBS) \
$(EVOLUTION_CALENDAR_LIBS)
server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 1032f5b42b..b6f60222b5 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -44,6 +44,7 @@
#include "alarm-queue.h"
#include "alarm-notify.h"
#include "config-data.h"
+#include <camel/camel-object.h>
@@ -153,6 +154,11 @@ main (int argc, char **argv)
g_idle_add ((GSourceFunc) init_alarm_service, NULL);
+ /* FIXME Ideally we should not use camel libraries in calendar, though it is the case
+ currently for attachments. Remove this once that is fixed.
+ Initialise global camel_object_type */
+ camel_object_get_type();
+
bonobo_main ();
bonobo_object_unref (BONOBO_OBJECT (factory));