This commit was manufactured by cvs2svn to create tagGNOME_MEDIA_1_2_2

'GNOME_MEDIA_1_2_2'.

svn path=/tags/GNOME_MEDIA_1_2_2/; revision=9684

7 files changed, 0 insertions, 1072 deletions

diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
deleted file mode 100644
index 5988e6cb08..0000000000
--- a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-_Name=Evolution Calendar Conduit
-_Comment=Configure the Evolution Calendar conduit
-Exec=e-calendar-conduit-control-applet --cap-id=1
-TryExec=e-calendar-conduit-control-applet
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
deleted file mode 100644
index ec5856fcad..0000000000
--- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Evolution ToDo Conduit
-_Comment=Configure the Evolution ToDo conduit
-Exec=e-todo-conduit-control-applet --cap-id=1
-TryExec=e-todo-conduit-control-applet
-Terminal=0
-Type=Application
diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
deleted file mode 100644
index bd61419d04..0000000000
--- a/calendar/gui/Evolution-Composer.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * This file was generated by orbit-idl - DO NOT EDIT!
- */
-
-#include <glib.h>
-#define ORBIT_IDL_SERIAL 9
-#include <orb/orbit.h>
-
-#ifndef Evolution_Composer_H
-#define Evolution_Composer_H 1
-#ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
-
-/** typedefs **/
-#include <bonobo/Bonobo.h>
-#if !defined(ORBIT_DECL_GNOME_Evolution_Composer) && !defined(_GNOME_Evolution_Composer_defined)
-#define ORBIT_DECL_GNOME_Evolution_Composer 1
-#define _GNOME_Evolution_Composer_defined 1
-#define GNOME_Evolution_Composer__free CORBA_Object__free
-   typedef CORBA_Object GNOME_Evolution_Composer;
-   extern CORBA_unsigned_long GNOME_Evolution_Composer__classid;
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_struct;
-#define TC_GNOME_Evolution_Composer ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_struct)
-#endif
-#endif
-#if !defined(_GNOME_Evolution_Composer_Recipient_defined)
-#define _GNOME_Evolution_Composer_Recipient_defined 1
-   typedef struct
-   {
-      CORBA_char *name;
-      CORBA_char *address;
-   }
-   GNOME_Evolution_Composer_Recipient;
-
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_Recipient_struct;
-#define TC_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_Recipient_struct)
-#endif
-   extern GNOME_Evolution_Composer_Recipient
-      *GNOME_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer GNOME_Evolution_Composer_Recipient__free(gpointer mem,
-							    gpointer dat,
-							    CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#if !defined(ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined)
-#define ORBIT_DECL_CORBA_sequence_GNOME_Evolution_Composer_Recipient 1
-#define _CORBA_sequence_GNOME_Evolution_Composer_Recipient_defined 1
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
-#define ORBIT_IMPL_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
-   typedef struct
-   {
-      CORBA_unsigned_long _maximum,
-       _length;
-      GNOME_Evolution_Composer_Recipient *_buffer;
-      CORBA_boolean _release;
-   }
-   CORBA_sequence_GNOME_Evolution_Composer_Recipient;
-#if !defined(TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0)
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_0 'E'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_1 'v'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_2 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_3 'l'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_4 'u'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_5 't'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_6 'i'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_7 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_8 'n'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_9 '_'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_10 'C'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_11 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_12 'm'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_13 'p'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_14 'o'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_15 's'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_16 'e'
-#define TC_IMPL_TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct;
-#define TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_GNOME_Evolution_Composer_Recipient_struct)
-#endif
-   extern CORBA_sequence_GNOME_Evolution_Composer_Recipient
-      *CORBA_sequence_GNOME_Evolution_Composer_Recipient__alloc(void);
-   extern gpointer
-      CORBA_sequence_GNOME_Evolution_Composer_Recipient__free(gpointer mem,
-							      gpointer dat,
-							      CORBA_boolean free_strings);	/* ORBit internal use */
-   GNOME_Evolution_Composer_Recipient
-      *CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf
-      (CORBA_unsigned_long len);
-#endif
-#if !defined(_GNOME_Evolution_Composer_RecipientList_defined)
-#define _GNOME_Evolution_Composer_RecipientList_defined 1
-   typedef CORBA_sequence_GNOME_Evolution_Composer_Recipient
-      GNOME_Evolution_Composer_RecipientList;
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_RecipientList_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_RecipientList_struct;
-#define TC_GNOME_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_RecipientList_struct)
-#endif
-   extern GNOME_Evolution_Composer_RecipientList
-      *GNOME_Evolution_Composer_RecipientList__alloc(void);
-   extern gpointer GNOME_Evolution_Composer_RecipientList__free(gpointer mem,
-								gpointer dat,
-								CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-#define ex_GNOME_Evolution_Composer_CouldNotParse "IDL:GNOME/Evolution/Composer/CouldNotParse:1.0"
-   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer
-								*
-								_ORBIT_recv_buffer,
-								CORBA_Environment
-								* ev);
-   void _ORBIT_GNOME_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
-							      _ORBIT_send_buffer,
-							      CORBA_Environment
-							      * ev);
-#if !defined(_GNOME_Evolution_Composer_CouldNotParse_defined)
-#define _GNOME_Evolution_Composer_CouldNotParse_defined 1
-   typedef struct
-   {
-      int dummy;
-   }
-   GNOME_Evolution_Composer_CouldNotParse;
-
-#if !defined(TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0)
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_0 'E'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_1 'v'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_2 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_3 'l'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_4 'u'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_5 't'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_6 'i'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_7 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_8 'n'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_9 '_'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_10 'C'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_11 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_12 'm'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_13 'p'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_14 'o'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_15 's'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_16 'e'
-#define TC_IMPL_TC_GNOME_Evolution_Composer_CouldNotParse_17 'r'
-   extern const struct CORBA_TypeCode_struct
-      TC_GNOME_Evolution_Composer_CouldNotParse_struct;
-#define TC_GNOME_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_GNOME_Evolution_Composer_CouldNotParse_struct)
-#endif
-#define GNOME_Evolution_Composer_CouldNotParse__alloc() NULL
-   extern gpointer GNOME_Evolution_Composer_CouldNotParse__free(gpointer mem,
-								gpointer dat,
-								CORBA_boolean free_strings);	/* ORBit internal use */
-#endif
-
-/** POA structures **/
-   typedef struct
-   {
-      void *_private;
-      void (*setHeaders) (PortableServer_Servant _servant,
-			  const GNOME_Evolution_Composer_RecipientList * to,
-			  const GNOME_Evolution_Composer_RecipientList * cc,
-			  const GNOME_Evolution_Composer_RecipientList * bcc,
-			  const CORBA_char * subject, CORBA_Environment * ev);
-      void (*setBodyText) (PortableServer_Servant _servant,
-			   const CORBA_char * body, CORBA_Environment * ev);
-      void (*attachMIME) (PortableServer_Servant _servant,
-			  const CORBA_char * data, CORBA_Environment * ev);
-      void (*attachData) (PortableServer_Servant _servant,
-			  const CORBA_char * content_type,
-			  const CORBA_char * filename,
-			  const CORBA_char * description,
-			  const CORBA_boolean show_inline,
-			  const CORBA_char * data, CORBA_Environment * ev);
-      void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
-   }
-   POA_GNOME_Evolution_Composer__epv;
-   typedef struct
-   {
-      PortableServer_ServantBase__epv *_base_epv;
-      POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
-      POA_GNOME_Evolution_Composer__epv *GNOME_Evolution_Composer_epv;
-   }
-   POA_GNOME_Evolution_Composer__vepv;
-   typedef struct
-   {
-      void *_private;
-      POA_GNOME_Evolution_Composer__vepv *vepv;
-   }
-   POA_GNOME_Evolution_Composer;
-   extern void POA_GNOME_Evolution_Composer__init(PortableServer_Servant
-						  servant,
-						  CORBA_Environment * ev);
-   extern void POA_GNOME_Evolution_Composer__fini(PortableServer_Servant
-						  servant,
-						  CORBA_Environment * ev);
-
-/** prototypes **/
-#define GNOME_Evolution_Composer_ref Bonobo_Unknown_ref
-#define GNOME_Evolution_Composer_unref Bonobo_Unknown_unref
-#define GNOME_Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
-   void GNOME_Evolution_Composer_setHeaders(GNOME_Evolution_Composer _obj,
-					    const
-					    GNOME_Evolution_Composer_RecipientList
-					    * to,
-					    const
-					    GNOME_Evolution_Composer_RecipientList
-					    * cc,
-					    const
-					    GNOME_Evolution_Composer_RecipientList
-					    * bcc, const CORBA_char * subject,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_setBodyText(GNOME_Evolution_Composer _obj,
-					     const CORBA_char * body,
-					     CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_attachMIME(GNOME_Evolution_Composer _obj,
-					    const CORBA_char * data,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_attachData(GNOME_Evolution_Composer _obj,
-					    const CORBA_char * content_type,
-					    const CORBA_char * filename,
-					    const CORBA_char * description,
-					    const CORBA_boolean show_inline,
-					    const CORBA_char * data,
-					    CORBA_Environment * ev);
-   void GNOME_Evolution_Composer_show(GNOME_Evolution_Composer _obj,
-				      CORBA_Environment * ev);
-
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_setHeaders
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_setHeaders) (PortableServer_Servant _servant,
-				 const GNOME_Evolution_Composer_RecipientList
-				 * to,
-				 const GNOME_Evolution_Composer_RecipientList
-				 * cc,
-				 const GNOME_Evolution_Composer_RecipientList
-				 * bcc, const CORBA_char * subject,
-				 CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_setBodyText
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_setBodyText) (PortableServer_Servant _servant,
-				  const CORBA_char * body,
-				  CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_attachMIME
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_attachMIME) (PortableServer_Servant _servant,
-				 const CORBA_char * data,
-				 CORBA_Environment * ev));
-   void
-      _ORBIT_skel_GNOME_Evolution_Composer_attachData
-      (POA_GNOME_Evolution_Composer * _ORBIT_servant,
-       GIOPRecvBuffer * _ORBIT_recv_buffer, CORBA_Environment * ev,
-       void (*_impl_attachData) (PortableServer_Servant _servant,
-				 const CORBA_char * content_type,
-				 const CORBA_char * filename,
-				 const CORBA_char * description,
-				 const CORBA_boolean show_inline,
-				 const CORBA_char * data,
-				 CORBA_Environment * ev));
-   void _ORBIT_skel_GNOME_Evolution_Composer_show(POA_GNOME_Evolution_Composer
-						  * _ORBIT_servant,
-						  GIOPRecvBuffer *
-						  _ORBIT_recv_buffer,
-						  CORBA_Environment * ev,
-						  void (*_impl_show)
-						  (PortableServer_Servant
-						   _servant,
-						   CORBA_Environment * ev));
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
-
-#endif
-#undef ORBIT_IDL_SERIAL
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
deleted file mode 100644
index 164d043e13..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <glade/glade.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *summary;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur: Occurrence time for the event.
- * @comp: Calendar component object which corresponds to the alarm.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- * 
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- * 
- * Return value: TRUE on success, FALSE if the dialog could not be created.
- **/
-gboolean
-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	char buf[256];
-	struct tm tm_trigger;
-	struct tm tm_occur;
-	CalComponentText summary;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-	g_return_val_if_fail (occur != -1, FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return FALSE;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->summary = glade_xml_get_widget (an->xml, "summary");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->summary
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		gtk_object_unref (GTK_OBJECT (an->xml));
-		g_free (an);
-		return FALSE;
-	}
-
-	gtk_object_set_data (GTK_OBJECT (an->dialog), "alarm-notify", an);
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);
-
-	/* Title */
-
-	/* FIXME: use am_pm_flag or 24-hour time */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	tm_occur = *localtime (&occur);
-	strftime (buf, sizeof (buf),
-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),
-		  &tm_occur);
-	gtk_label_set_text (GTK_LABEL (an->heading), buf);
-
-	/* Summary */
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		gtk_label_set_text (GTK_LABEL (an->summary), summary.value);
-	else
-		gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available."));
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
deleted file mode 100644
index f2c938c495..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index 41718d0572..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution Calendar</name>
-  <program_name>evolution-calendar</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title></title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox2</name>
-    <border_width>4</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>summary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Close</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Snooze</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Edit appointment</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Snooze time (minutes)</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkSpinButton</class>
-	<name>snooze-time</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<climb_rate>1</climb_rate>
-	<digits>0</digits>
-	<numeric>False</numeric>
-	<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	<snap>False</snap>
-	<wrap>False</wrap>
-	<value>5</value>
-	<lower>1</lower>
-	<upper>1440</upper>
-	<step>1</step>
-	<page>5</page>
-	<page_size>5</page_size>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c
deleted file mode 100644
index 7ebe2b5f8e..0000000000
--- a/calendar/gui/evolution-calendar-control.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
-
-#include <cal-util/timeutil.h>
-#include <gui/alarm.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-
-#define PROPERTY_CALENDAR_URI "folder_uri"
-
-#define PROPERTY_CALENDAR_URI_IDX 1
-
-#ifdef USING_OAF
-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-#else
-#define CONTROL_FACTORY_ID   "control-factory:calendar"
-#endif
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     gpointer user_data)
-{
-	if (activate)
-		calendar_control_activate (control, user_data);
-	else
-		calendar_control_deactivate (control);
-}
-
-
-
-static void
-init_bonobo (int *argc, char **argv)
-{
-#ifdef USING_OAF
-	/* FIXME: VERSION instead of "0.0".  */
-	gnome_init_with_popt_table ("evolution-calendar", "0.0",
-				    *argc, argv, oaf_popt_options,
-				    0, NULL);
-	oaf_init (*argc, argv);
-#else
-	gnome_CORBA_init_with_popt_table (
-		"evolution-calendar", "0.0",
-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-#endif
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_gnome_init ();
-}
-
-
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));
-		filename = g_strdup_printf ("%s/calendar.vcf",
-					    BONOBO_ARG_GET_STRING (arg));
-		calendar_set_uri (gcal, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal)
-{
-	gcal->properties = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (gcal->properties,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_property_bag (gcal->control, gcal->properties);
-}
-
-
-
-static BonoboObject *
-calendar_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl *control;
-
-	/* Create the control. */
-	GnomeCalendar *cal = new_calendar (full_name, NULL, NULL, 0);
-
-	gtk_widget_show (GTK_WIDGET (cal));
-
-	control = bonobo_control_new (GTK_WIDGET (cal));
-	cal->control = control;
-
-	calendar_properties_init (cal);
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, cal);
-
-	return BONOBO_OBJECT (control);
-}
-
-
-static void
-calendar_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	puts ("XXXXXX - initializing calendar factory!!!");
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, calendar_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-
-int
-main (int argc, char **argv)
-{
-	init_bonobo (&argc, argv);
-	glade_gnome_init ();
-	alarm_init ();
-	e_cursors_init ();
-
-	init_calendar ();
-
-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-
-	CORBA_exception_init (&ev);
-
-	calendar_control_factory_init ();
-	component_factory_init ();
-
-	bonobo_main ();
-
-	return 0;
-}