From 8564ecae4892d2c8ebe5207cba869560a1f2d858 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Mon, 31 Jan 2005 22:04:34 +0000 Subject: [PATCH] Remove definition of CalObjUID and include that from 2005-01-31 Hans Petter Jansson * idl/evolution-calendar.idl: Remove definition of CalObjUID and include that from Evolution-DataServer-Calendar.idl instead. This prevents the typecode from being defined twice. svn path=/trunk/; revision=28642 --- calendar/ChangeLog | 6 ++++++ calendar/idl/evolution-calendar.idl | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9d12dea57c..4344ce59f8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2005-01-31 Hans Petter Jansson + + * idl/evolution-calendar.idl: Remove definition of CalObjUID and + include that from Evolution-DataServer-Calendar.idl instead. This + prevents the typecode from being defined twice. + 2005-01-31 Hans Petter Jansson * gui/e-cal-config.c (_ECalConfigPrivate): Use guint instead of ulong diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl index 532fa2a0e4..48f7281ab3 100644 --- a/calendar/idl/evolution-calendar.idl +++ b/calendar/idl/evolution-calendar.idl @@ -12,14 +12,12 @@ #define _EVOLUTION_CALENDAR_IDL_ #include +#include module GNOME { module Evolution { module Calendar { - /* A unique identifier for a calendar component */ - typedef string CalObjUID; - /* Factory to centralize calendar component editor dialogs */ interface CompEditorFactory : Bonobo::Unknown { exception InvalidURI {};