Make Evolution compile with the latest Bonobo changes.

Make Evolution compile with the latest Bonobo changes.

Miguel.

svn path=/trunk/; revision=1636

7 files changed, 58 insertions, 62 deletions

diff --git a/shell/Evolution.idl b/shell/Evolution.idl
index 936f60633e..51b083c5d7 100644
--- a/shell/Evolution.idl
+++ b/shell/Evolution.idl
@@ -6,27 +6,23 @@
  *
  * (C) 2000 Helix Code, Inc.
  */
-#include <bonobo.idl>
+#include <Bonobo.idl>
 
-module GNOME {
-
-	module Evolution {
-
-		interface Shell : GNOME::Unknown {
-			enum NewType {
-				APPOINTMENT,
-				MEETING_REQUEST,
-				TASK,
-				TASK_REQUEST,
-				CONTACT,
-				MAIL_MESSAGE,
-				DISTRIBUTION_LIST,
-				JOURNAL_ENTRY,
-				NOTE
-			};
-			
-			void new (in NewType type);
+module Evolution {
+	interface Shell : Bonobo::Unknown {
+		enum NewType {
+			APPOINTMENT,
+			MEETING_REQUEST,
+			TASK,
+			TASK_REQUEST,
+			CONTACT,
+			MAIL_MESSAGE,
+			DISTRIBUTION_LIST,
+			JOURNAL_ENTRY,
+			NOTE
 		};
+		
+		void new (in NewType type);
 	};
 };
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 1aea62ce1e..b9a466b21c 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -35,7 +35,7 @@ evolution_SOURCES =		\
 
 Evolution-impl.o: Evolution.h
 
-$(EVOOLUTION_CORBA_GENERATED): Evolution.idl 
+$(EVOLUTION_CORBA_GENERATED): Evolution.idl 
 	orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Evolution.idl
 
 evolution_LDADD = 					\
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 41129ec5f3..8e8231d774 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -215,13 +215,13 @@ static GnomeUIInfo esv_menu [] = {
 void
 e_shell_view_setup_menus (EShellView *eshell_view)
 {
-	GnomeUIHandlerMenuItem *list;
+	BonoboUIHandlerMenuItem *list;
 
-	eshell_view->uih = gnome_ui_handler_new ();
-	gnome_ui_handler_set_app (eshell_view->uih, GNOME_APP (eshell_view));
-	gnome_ui_handler_create_menubar (eshell_view->uih);
+	eshell_view->uih = bonobo_ui_handler_new ();
+	bonobo_ui_handler_set_app (eshell_view->uih, GNOME_APP (eshell_view));
+	bonobo_ui_handler_create_menubar (eshell_view->uih);
 
-	list = gnome_ui_handler_menu_parse_uiinfo_list_with_data (esv_menu, eshell_view);
-	gnome_ui_handler_menu_add_list (eshell_view->uih, "/", list);
-	gnome_ui_handler_menu_free_list (list);
+	list = bonobo_ui_handler_menu_parse_uiinfo_list_with_data (esv_menu, eshell_view);
+	bonobo_ui_handler_menu_add_list (eshell_view->uih, "/", list);
+	bonobo_ui_handler_menu_free_list (list);
 }
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index b8737a5fc8..5f5c5d39c6 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -1,8 +1,8 @@
 #ifndef E_SHELL_VIEW_H
 #define E_SHELL_VIEW_H
 
-#include <bonobo/gnome-object.h>
-#include <bonobo/gnome-ui-handler.h>
+#include <bonobo/bonobo-object.h>
+#include <bonobo/bonobo-ui-handler.h>
 #include "e-shell.h"
 
 #define E_SHELL_VIEW_TYPE        (e_shell_view_get_type ())
@@ -18,7 +18,7 @@ struct _EShellView {
 	EShell  *eshell;
 
 	/* Our user interface handler */
-	GnomeUIHandler *uih;
+	BonoboUIHandler *uih;
 
 
 	EFolder   *efolder;
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 9be32ba3c1..cd4be67bc6 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -14,10 +14,10 @@
 #include "e-util/e-util.h"
 #include "e-shell.h"
 
-#define PARENT_TYPE (gnome_object_get_type ())
+#define PARENT_TYPE (bonobo_object_get_type ())
 
-static GnomeObjectClass *e_shell_parent_class;
-POA_GNOME_Evolution_Shell__vepv eshell_vepv;
+static BonoboObjectClass *e_shell_parent_class;
+POA_Evolution_Shell__vepv eshell_vepv;
 
 GtkType e_shell_get_type (void);
 
@@ -77,45 +77,45 @@ e_shell_new_note (EShell *eshell)
 
 static void
 EShell_cmd_new (PortableServer_Servant servant,
-		const GNOME_Evolution_Shell_NewType type,
+		const Evolution_Shell_NewType type,
 		CORBA_Environment *ev)
 {
-	EShell *eshell = E_SHELL (gnome_object_from_servant (servant));
+	EShell *eshell = E_SHELL (bonobo_object_from_servant (servant));
 
 	switch (type){
-	case GNOME_Evolution_Shell_APPOINTMENT:
+	case Evolution_Shell_APPOINTMENT:
 		e_shell_new_appointment (eshell);
 		break;
 		
-	case GNOME_Evolution_Shell_MEETING_REQUEST:
+	case Evolution_Shell_MEETING_REQUEST:
 		e_shell_new_meeting_request (eshell);
 		break;
 
-	case GNOME_Evolution_Shell_TASK:
+	case Evolution_Shell_TASK:
 		e_shell_new_task (eshell);
 		break;
 
-	case GNOME_Evolution_Shell_TASK_REQUEST:
+	case Evolution_Shell_TASK_REQUEST:
 		e_shell_new_task_request (eshell);
 		break;
 
-	case GNOME_Evolution_Shell_CONTACT:
+	case Evolution_Shell_CONTACT:
 		e_shell_new_contact (eshell);
 		break;
 
-	case GNOME_Evolution_Shell_MAIL_MESSAGE:
+	case Evolution_Shell_MAIL_MESSAGE:
 		e_shell_new_mail_message (eshell);
 		break;
 
-	case GNOME_Evolution_Shell_DISTRIBUTION_LIST:
+	case Evolution_Shell_DISTRIBUTION_LIST:
 		e_shell_new_distribution_list (eshell);
 		break;
 
-	case GNOME_Evolution_Shell_JOURNAL_ENTRY:
+	case Evolution_Shell_JOURNAL_ENTRY:
 		e_shell_new_journal_entry (eshell);
 		break;
 		
-	case GNOME_Evolution_Shell_NOTE:
+	case Evolution_Shell_NOTE:
 		e_shell_new_note (eshell);
 		break;
 		
@@ -123,12 +123,12 @@ EShell_cmd_new (PortableServer_Servant servant,
 	}
 }
 
-static POA_GNOME_Evolution_Shell__epv *
+static POA_Evolution_Shell__epv *
 e_shell_get_epv (void)
 {
-	POA_GNOME_Evolution_Shell__epv *epv;
+	POA_Evolution_Shell__epv *epv;
 
-	epv = g_new0 (POA_GNOME_Evolution_Shell__epv, 1);
+	epv = g_new0 (POA_Evolution_Shell__epv, 1);
 
 	epv->new = EShell_cmd_new;
 
@@ -138,8 +138,8 @@ e_shell_get_epv (void)
 static void
 init_e_shell_corba_class (void)
 {
-	eshell_vepv.GNOME_Unknown_epv = gnome_object_get_epv ();
-	eshell_vepv.GNOME_Evolution_Shell_epv = e_shell_get_epv ();
+	eshell_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
+	eshell_vepv.Evolution_Shell_epv = e_shell_get_epv ();
 }
 
 static void
@@ -199,17 +199,17 @@ e_shell_quit (EShell *eshell)
 }
 
 static CORBA_Object
-create_corba_eshell (GnomeObject *object)
+create_corba_eshell (BonoboObject *object)
 {
-	POA_GNOME_Evolution_Shell *servant;
+	POA_Evolution_Shell *servant;
 	CORBA_Environment ev;
 
-	servant = (POA_GNOME_Evolution_Shell *)g_new0 (GnomeObjectServant, 1);
+	servant = (POA_Evolution_Shell *)g_new0 (BonoboObjectServant, 1);
 	servant->vepv = &eshell_vepv;
 
 	CORBA_exception_init (&ev);
 
-	POA_GNOME_Evolution_Shell__init ((PortableServer_Servant) servant, &ev);
+	POA_Evolution_Shell__init ((PortableServer_Servant) servant, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION){
 		CORBA_exception_free (&ev);
 		g_free (servant);
@@ -218,7 +218,7 @@ create_corba_eshell (GnomeObject *object)
 
 	CORBA_exception_free (&ev);
 
-	return gnome_object_activate_servant (object, servant);
+	return bonobo_object_activate_servant (object, servant);
 }
 
 static void
@@ -297,20 +297,20 @@ e_shell_init (GtkObject *object)
 }
 
 static void
-e_shell_construct (EShell *eshell, GNOME_Evolution_Shell corba_eshell)
+e_shell_construct (EShell *eshell, Evolution_Shell corba_eshell)
 {
-	gnome_object_construct (GNOME_OBJECT (eshell), corba_eshell);
+	bonobo_object_construct (BONOBO_OBJECT (eshell), corba_eshell);
 }
 
 EShell *
 e_shell_new (void)
 {
-	GNOME_Evolution_Shell corba_eshell;
+	Evolution_Shell corba_eshell;
 	EShell *eshell;
 
 	eshell = gtk_type_new (e_shell_get_type ());
 
-	corba_eshell = create_corba_eshell (GNOME_OBJECT (eshell));
+	corba_eshell = create_corba_eshell (BONOBO_OBJECT (eshell));
 	if (corba_eshell == CORBA_OBJECT_NIL){
 		gtk_object_destroy (GTK_OBJECT (eshell));
 		return NULL;
diff --git a/shell/e-shell.h b/shell/e-shell.h
index b2778f0444..64de044fb4 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -1,7 +1,7 @@
 #ifndef E_SHELL_H
 #define E_SHELL_H
 
-#include <bonobo/gnome-object.h>
+#include <bonobo/bonobo-object.h>
 #include "evolution.h"
 #include "e-folder.h"
 #include "e-shortcut.h"
@@ -16,7 +16,7 @@
 #define E_IS_SHELL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SHELL_TYPE))
 
 struct _EShell {
-	GnomeObject base_object;
+	BonoboObject base_object;
 
 	/* A list of EShellViews */
 	GSList *views;
@@ -35,7 +35,7 @@ struct _EShell {
 };
 
 typedef struct {
-	GnomeObjectClass parent_class;
+	BonoboObjectClass parent_class;
 } EShellClass;
 
 EShell     *e_shell_new             (void);
diff --git a/shell/main.c b/shell/main.c
index 1d30bbad7d..1d6d8bed7c 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -8,7 +8,7 @@
 #include <config.h>
 #include <gnome.h>
 #include <libgnorba/gnorba.h>
-#include <bonobo/gnome-bonobo.h>
+#include <bonobo.h>
 #include <e-util/e-gui-utils.h>
 #include <e-util/e-cursors.h>
 #include <glade/glade.h>