diff options
Diffstat (limited to 'shell')
38 files changed, 475 insertions, 466 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 27db093018..2fc012e223 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2000-11-06 Michael Meeks <michael@helixcode.com> + + * e-shell-view.c (unrealize): remove. + (e_shell_view_construct): ditto. + 2000-11-09 Christopher James Lahey <clahey@helixcode.com> * e-shell-view.c: Make the panes of the EPaned not shrinkable diff --git a/shell/Evolution-LocalStorage.idl b/shell/Evolution-LocalStorage.idl index 4ca81670e4..04d04c7150 100644 --- a/shell/Evolution-LocalStorage.idl +++ b/shell/Evolution-LocalStorage.idl @@ -10,6 +10,7 @@ #include <Bonobo.idl> +module GNOME { module Evolution { interface LocalStorage : Evolution::Storage { /** @@ -22,8 +23,9 @@ module Evolution { * Set the name to display for the folder at the specified * @path. */ - void update_folder (in string path, - in string display_name, - in boolean highlighted); + void updateFolder (in string path, + in string display_name, + in boolean highlighted); }; }; +}; diff --git a/shell/Evolution-Session.idl b/shell/Evolution-Session.idl index 855f1c03ea..6e842e421c 100644 --- a/shell/Evolution-Session.idl +++ b/shell/Evolution-Session.idl @@ -10,30 +10,32 @@ #include <Bonobo.h> +module GNOME { module Evolution { interface Session : Bonobo::Unknown { exception Failed {}; /** - * save_configuration: + * saveConfiguration: * @prefix: A configuration path prefix. * * Save the current configuration at the specified @prefix. * The component can use any path starting by @prefix for its * keys. */ - void save_configuration (in string prefix) + void saveConfiguration (in string prefix) raises (Failed); /** - * load_configuration: + * loadConfiguration: * @prefix: A configuration path prefix. * * Load the saved configuration at the specified @prefix. */ - void load_configuration (in string prefix) + void loadConfiguration (in string prefix) raises (Failed); }; }; +}; diff --git a/shell/Evolution-Shell.idl b/shell/Evolution-Shell.idl index 0102ba09ec..7a06d902d4 100644 --- a/shell/Evolution-Shell.idl +++ b/shell/Evolution-Shell.idl @@ -10,6 +10,7 @@ #include <Bonobo.idl> +module GNOME { module Evolution { interface ShellComponent; @@ -20,7 +21,7 @@ module Evolution { exception Busy {}; /** - * get_component_for_type: + * getComponentByType: * @type: name of a valid folder type * * Get the shell component associated with a specific folder type. @@ -28,13 +29,13 @@ module Evolution { * Return value: the Evolution::ShellComponent interface for the component that * handles @type. */ - ShellComponent get_component_for_type (in string type) + ShellComponent getComponentByType (in string type) raises (NotFound); typedef sequence<string> FolderTypeList; /** - * user_select_folder: + * selectUserFolder: * @listener: a listener interface to report the answer of the user. * @title: title for the folder selector dialog * @default_folder: physical or `evolution:' URI for the folder that must be @@ -46,14 +47,14 @@ module Evolution { * folder by using the "New..." button. The dialog only lets the user choose * a folder whose type is listed in @possible_types. */ - void user_select_folder (in FolderSelectionListener listener, + void selectUserFolder (in FolderSelectionListener listener, in string title, in string default_folder, in FolderTypeList possible_types) raises (Busy); /** - * get_local_storage: + * getLocalStorage: * * Get the interface to the local storage. * @@ -62,21 +63,22 @@ module Evolution { * * Return value: the `Evolution::LocalStorage' interface for * the local storage. */ - LocalStorage get_local_storage (); + LocalStorage getLocalStorage (); /** - * create_storage_set_view: + * createStorageSetView: * * Create a control for the storage set view. This control * will also implement the `Evolution::StorageSetView' interface. * * Return value: the newly created control. */ - Bonobo::Control create_storage_set_view (); + Bonobo::Control createStorageSetView (); }; interface FolderSelectionListener { - void selected (in string uri, in string physical_uri); - void cancel (); + void notifySelected (in string uri, in string physical_uri); + void notifyCanceled (); }; }; +}; diff --git a/shell/Evolution-ShellComponent.idl b/shell/Evolution-ShellComponent.idl index 106ec0d571..592245481e 100644 --- a/shell/Evolution-ShellComponent.idl +++ b/shell/Evolution-ShellComponent.idl @@ -10,6 +10,7 @@ #include <Bonobo.h> +module GNOME { module Evolution { interface Shell; @@ -28,12 +29,12 @@ module Evolution { /* FIXME: Can we use an attribute here? */ exception AlreadyOwned {}; - void set_owner (in Shell shell, in string evolution_homedir) + void setOwner (in Shell shell, in string evolution_homedir) raises (AlreadyOwned); exception NotOwned {}; - void unset_owner () + void unsetOwner () raises (NotOwned); /* FIXME: We might want more exceptions here. */ @@ -41,23 +42,24 @@ module Evolution { exception UnsupportedType {}; exception InternalError {}; - Bonobo::Control create_view (in string physical_uri, - in string type) + Bonobo::Control createView (in string physical_uri, + in string type) raises (NotFound, UnsupportedType, InternalError); exception Busy {}; - void async_create_folder (in ShellComponentListener listener, - in string physical_uri, - in string type) + void addFolderAsync (in ShellComponentListener listener, + in string physical_uri, + in string type) raises (Busy); - void async_remove_folder (in ShellComponentListener listener, - in string physical_uri) + + void removeFolderAsync (in ShellComponentListener listener, + in string physical_uri) raises (Busy); - void populate_folder_context_menu (in Bonobo::UIContainer uih, - in string physical_uri, - in string type); + void populateFolderContextMenu (in Bonobo::UIContainer uih, + in string physical_uri, + in string type); }; interface ShellComponentListener { @@ -72,6 +74,7 @@ module Evolution { NO_SPACE }; - void report_result (in Result result); + void notifyResult (in Result result); }; }; +}; diff --git a/shell/Evolution-ShellView.idl b/shell/Evolution-ShellView.idl index d155b3397c..75734a155c 100644 --- a/shell/Evolution-ShellView.idl +++ b/shell/Evolution-ShellView.idl @@ -10,11 +10,14 @@ #include <Bonobo.idl> +module GNOME { module Evolution { interface ShellView : Bonobo::Unknown { - void set_message (in string message, in boolean busy); - void unset_message (); - void change_current_view (in string uri); - void set_title (in string title); + void setMessage (in string message, + in boolean busy); + void unsetMessage (); + void changeCurrentView (in string uri); + void setTitle (in string title); }; }; +}; diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl index 5aadf8eb19..ab0aa64fa6 100644 --- a/shell/Evolution-Storage.idl +++ b/shell/Evolution-Storage.idl @@ -10,6 +10,7 @@ #include <Bonobo.h> +module GNOME { module Evolution { struct Folder { string type; @@ -28,10 +29,10 @@ module Evolution { attribute string name; - void add_listener (in StorageListener listener) + void addListener (in StorageListener listener) raises (AlreadyListening); - void remove_listener (in StorageListener listener) + void removeListener (in StorageListener listener) raises (NotFound); }; @@ -39,18 +40,20 @@ module Evolution { exception Exists {}; exception NotFound {}; - void destroyed (); + void notifyDestroyed (); /* FIXME exceptions don't make much sense here... */ - void new_folder (in string path, in Folder folder) + void notifyFolderCreated (in string path, + in Folder folder) raises (Exists); - - void update_folder (in string path, in string display_name, - in boolean highlighted) + + void notifyFolderUpdated (in string path, + in string display_name, + in boolean highlighted) raises (NotFound); - void removed_folder (in string path) + void notifyFolderRemoved (in string path) raises (NotFound); }; @@ -58,10 +61,11 @@ module Evolution { exception Exists {}; exception NotFound {}; - StorageListener register_storage (in Storage storage, in string name) + StorageListener addStorage (in Storage storage, in string name) raises (Exists); - void unregister_storage (in string name) + void removeStorageByName (in string name) raises (NotFound); }; }; +}; diff --git a/shell/Evolution-StorageSetView.idl b/shell/Evolution-StorageSetView.idl index 3d95b075be..43b05fe860 100644 --- a/shell/Evolution-StorageSetView.idl +++ b/shell/Evolution-StorageSetView.idl @@ -10,10 +10,11 @@ #include <Bonoob.idl> +module GNOME { module Evolution { interface StorageSetViewListener { - void folder_selected (in string uri); - void storage_selected (in string uri); + void notifyFolderSelected (in string uri); + void notifyStorageSelected (in string uri); }; /* FIXME: Maybe we should have a generic Bonobo::Listener interface. */ @@ -21,11 +22,13 @@ module Evolution { exception AlreadyListening {}; exception NotFound {}; - attribute boolean show_folders; + attribute boolean showFolders; - void add_listener (in StorageSetViewListener listener) + void addListener (in StorageSetViewListener listener) raises (AlreadyListening); - void remove_listener (in StorageSetViewListener listener) + + void removeListener (in StorageSetViewListener listener) raises (NotFound); }; }; +}; diff --git a/shell/Makefile.am b/shell/Makefile.am index 97205112ff..a642493448 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -38,8 +38,8 @@ IDL_GENERATED = \ Evolution-impl.o: Evolution.h $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ - -I$(srcdir) $(srcdir)/Evolution.idl + $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(srcdir)/Evolution.idl # Shell library diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 4ec951a81c..89638fa14c 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -81,12 +81,12 @@ component_new (const char *id, static void component_free (Component *component) { - Evolution_ShellComponent corba_shell_component; + GNOME_Evolution_ShellComponent corba_shell_component; CORBA_Environment ev; CORBA_exception_init (&ev); corba_shell_component = bonobo_object_corba_objref (BONOBO_OBJECT (component->client)); - Evolution_ShellComponent_unset_owner (corba_shell_component, &ev); + GNOME_Evolution_ShellComponent_unsetOwner (corba_shell_component, &ev); if (ev._major != CORBA_NO_EXCEPTION) g_warning ("Cannot unregister component -- %s", component->id); else @@ -131,9 +131,9 @@ register_component (EComponentRegistry *component_registry, const char *id) { EComponentRegistryPrivate *priv; - Evolution_ShellComponent component_corba_interface; - Evolution_Shell shell_corba_interface; - Evolution_FolderTypeList *supported_types; + GNOME_Evolution_ShellComponent component_corba_interface; + GNOME_Evolution_Shell shell_corba_interface; + GNOME_Evolution_FolderTypeList *supported_types; Component *component; EvolutionShellComponentClient *client; CORBA_Environment ev; @@ -158,7 +158,7 @@ register_component (EComponentRegistry *component_registry, component_corba_interface = bonobo_object_corba_objref (BONOBO_OBJECT (client)); shell_corba_interface = bonobo_object_corba_objref (BONOBO_OBJECT (priv->shell)); - supported_types = Evolution_ShellComponent__get_supported_types (component_corba_interface, &ev); + supported_types = GNOME_Evolution_ShellComponent__get_supported_types (component_corba_interface, &ev); if (ev._major != CORBA_NO_EXCEPTION || supported_types->_length == 0) { bonobo_object_unref (BONOBO_OBJECT (client)); CORBA_exception_free (&ev); @@ -171,7 +171,7 @@ register_component (EComponentRegistry *component_registry, g_hash_table_insert (priv->component_id_to_component, component->id, component); for (i = 0; i < supported_types->_length; i++) { - const Evolution_FolderType *type; + const GNOME_Evolution_FolderType *type; type = supported_types->_buffer + i; diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c index a1881f10dd..b0c4a34d74 100644 --- a/shell/e-corba-storage-registry.c +++ b/shell/e-corba-storage-registry.c @@ -42,20 +42,20 @@ struct _ECorbaStorageRegistryPrivate { /* CORBA interface implementation. */ -static POA_Evolution_StorageRegistry__vepv storage_registry_vepv; +static POA_GNOME_Evolution_StorageRegistry__vepv storage_registry_vepv; -static POA_Evolution_StorageRegistry * +static POA_GNOME_Evolution_StorageRegistry * create_servant (void) { - POA_Evolution_StorageRegistry *servant; + POA_GNOME_Evolution_StorageRegistry *servant; CORBA_Environment ev; - servant = (POA_Evolution_StorageRegistry *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_StorageRegistry *) g_new0 (BonoboObjectServant, 1); servant->vepv = &storage_registry_vepv; CORBA_exception_init (&ev); - POA_Evolution_StorageRegistry__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_StorageRegistry__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -67,9 +67,9 @@ create_servant (void) return servant; } -static Evolution_StorageListener +static GNOME_Evolution_StorageListener impl_StorageRegistry_register_storage (PortableServer_Servant servant, - const Evolution_Storage storage_interface, + const GNOME_Evolution_Storage storage_interface, const CORBA_char *name, CORBA_Environment *ev) { @@ -77,7 +77,7 @@ impl_StorageRegistry_register_storage (PortableServer_Servant servant, ECorbaStorageRegistry *storage_registry; ECorbaStorageRegistryPrivate *priv; EStorage *storage; - Evolution_StorageListener listener_interface; + GNOME_Evolution_StorageListener listener_interface; g_print ("Shell: Registering storage -- %s\n", name); @@ -90,7 +90,7 @@ impl_StorageRegistry_register_storage (PortableServer_Servant servant, if (! e_storage_set_add_storage (priv->storage_set, storage)) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_StorageRegistry_Exists, + ex_GNOME_Evolution_StorageRegistry_Exists, NULL); return CORBA_OBJECT_NIL; } @@ -120,7 +120,7 @@ impl_StorageRegistry_unregister_storage (PortableServer_Servant servant, storage = e_storage_set_get_storage (priv->storage_set, name); if (storage == NULL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_StorageRegistry_NotFound, + ex_GNOME_Evolution_StorageRegistry_NotFound, NULL); return; } @@ -155,8 +155,8 @@ destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_StorageRegistry__vepv *vepv; - POA_Evolution_StorageRegistry__epv *epv; + POA_GNOME_Evolution_StorageRegistry__vepv *vepv; + POA_GNOME_Evolution_StorageRegistry__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -164,14 +164,14 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_StorageRegistry__epv, 1); - epv->register_storage = impl_StorageRegistry_register_storage; - epv->unregister_storage = impl_StorageRegistry_unregister_storage; + epv = g_new0 (POA_GNOME_Evolution_StorageRegistry__epv, 1); + epv->addStorage = impl_StorageRegistry_register_storage; + epv->removeStorageByName = impl_StorageRegistry_unregister_storage; vepv = &storage_registry_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_StorageRegistry_epv = epv; + vepv->GNOME_Evolution_StorageRegistry_epv = epv; } static void @@ -201,7 +201,7 @@ init (ECorbaStorageRegistry *corba_storage_registry) void e_corba_storage_registry_construct (ECorbaStorageRegistry *corba_storage_registry, - Evolution_StorageRegistry corba_object, + GNOME_Evolution_StorageRegistry corba_object, EStorageSet *storage_set) { ECorbaStorageRegistryPrivate *priv; @@ -222,8 +222,8 @@ ECorbaStorageRegistry * e_corba_storage_registry_new (EStorageSet *storage_set) { ECorbaStorageRegistry *corba_storage_registry; - POA_Evolution_StorageRegistry *servant; - Evolution_StorageRegistry corba_object; + POA_GNOME_Evolution_StorageRegistry *servant; + GNOME_Evolution_StorageRegistry corba_object; g_return_val_if_fail (storage_set != NULL, NULL); g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL); diff --git a/shell/e-corba-storage-registry.h b/shell/e-corba-storage-registry.h index baf689c551..e9bbd5997b 100644 --- a/shell/e-corba-storage-registry.h +++ b/shell/e-corba-storage-registry.h @@ -62,7 +62,7 @@ struct _ECorbaStorageRegistryClass { GtkType e_corba_storage_registry_get_type (void); void e_corba_storage_registry_construct (ECorbaStorageRegistry *corba_storage_registry, - Evolution_StorageRegistry corba_object, + GNOME_Evolution_StorageRegistry corba_object, EStorageSet *storage_set); ECorbaStorageRegistry *e_corba_storage_registry_new (EStorageSet *storage_set); diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c index c6a3a99cdc..9b571d04f6 100644 --- a/shell/e-corba-storage.c +++ b/shell/e-corba-storage.c @@ -42,21 +42,21 @@ typedef struct _StorageListenerServant StorageListenerServant; struct _ECorbaStoragePrivate { char *name; - Evolution_Storage storage_interface; + GNOME_Evolution_Storage storage_interface; /* The Evolution::StorageListener interface we expose. */ - Evolution_StorageListener storage_listener_interface; + GNOME_Evolution_StorageListener storage_listener_interface; StorageListenerServant *storage_listener_servant; }; /* Implementation of the CORBA Evolution::StorageListener interface. */ -static POA_Evolution_StorageListener__vepv storage_listener_vepv; +static POA_GNOME_Evolution_StorageListener__vepv storage_listener_vepv; struct _StorageListenerServant { - POA_Evolution_StorageListener servant; + POA_GNOME_Evolution_StorageListener servant; EStorage *storage; }; @@ -95,7 +95,7 @@ impl_StorageListener_destroy (PortableServer_Servant servant, static void impl_StorageListener_new_folder (PortableServer_Servant servant, const CORBA_char *path, - const Evolution_Folder *folder, + const GNOME_Evolution_Folder *folder, CORBA_Environment *ev) { StorageListenerServant *storage_listener_servant; @@ -116,7 +116,7 @@ impl_StorageListener_new_folder (PortableServer_Servant servant, g_print ("Cannot register folder -- %s %s\n", path, folder->display_name); CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_StorageListener_Exists, + ex_GNOME_Evolution_StorageListener_Exists, NULL); gtk_object_unref (GTK_OBJECT (e_folder)); return; @@ -143,7 +143,7 @@ impl_StorageListener_update_folder (PortableServer_Servant servant, if (e_folder == NULL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_StorageListener_NotFound, + ex_GNOME_Evolution_StorageListener_NotFound, NULL); return; } @@ -168,7 +168,7 @@ impl_StorageListener_removed_folder (PortableServer_Servant servant, if (! e_storage_removed_folder (storage, path)) CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_StorageListener_NotFound, + ex_GNOME_Evolution_StorageListener_NotFound, NULL); } @@ -178,7 +178,7 @@ setup_storage_listener (ECorbaStorage *corba_storage) { StorageListenerServant *servant; ECorbaStoragePrivate *priv; - Evolution_StorageListener storage_listener_interface; + GNOME_Evolution_StorageListener storage_listener_interface; CORBA_Environment ev; priv = corba_storage->priv; @@ -187,7 +187,7 @@ setup_storage_listener (ECorbaStorage *corba_storage) CORBA_exception_init (&ev); - POA_Evolution_StorageListener__init (servant, &ev); + POA_GNOME_Evolution_StorageListener__init (servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) goto error; @@ -243,7 +243,7 @@ destroy (GtkObject *object) &ev); PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev); - POA_Evolution_StorageListener__fini (priv->storage_listener_servant, &ev); + POA_GNOME_Evolution_StorageListener__fini (priv->storage_listener_servant, &ev); CORBA_free (object_id); } @@ -273,8 +273,8 @@ get_name (EStorage *storage) static void corba_class_init (void) { - POA_Evolution_StorageListener__vepv *vepv; - POA_Evolution_StorageListener__epv *epv; + POA_GNOME_Evolution_StorageListener__vepv *vepv; + POA_GNOME_Evolution_StorageListener__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -282,14 +282,14 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_StorageListener__epv, 1); - epv->new_folder = impl_StorageListener_new_folder; - epv->update_folder = impl_StorageListener_update_folder; - epv->removed_folder = impl_StorageListener_removed_folder; + epv = g_new0 (POA_GNOME_Evolution_StorageListener__epv, 1); + epv->notifyFolderCreated = impl_StorageListener_new_folder; + epv->notifyFolderUpdated = impl_StorageListener_update_folder; + epv->notifyFolderRemoved = impl_StorageListener_removed_folder; vepv = &storage_listener_vepv; vepv->_base_epv = base_epv; - vepv->Evolution_StorageListener_epv = epv; + vepv->GNOME_Evolution_StorageListener_epv = epv; } static void @@ -325,7 +325,7 @@ init (ECorbaStorage *corba_storage) /* FIXME: OK to have a boolean construct function? */ void e_corba_storage_construct (ECorbaStorage *corba_storage, - const Evolution_Storage storage_interface, + const GNOME_Evolution_Storage storage_interface, const char *name) { ECorbaStoragePrivate *priv; @@ -357,7 +357,7 @@ e_corba_storage_construct (ECorbaStorage *corba_storage, } EStorage * -e_corba_storage_new (const Evolution_Storage storage_interface, +e_corba_storage_new (const GNOME_Evolution_Storage storage_interface, const char *name) { EStorage *new; @@ -373,7 +373,7 @@ e_corba_storage_new (const Evolution_Storage storage_interface, } -const Evolution_StorageListener +const GNOME_Evolution_StorageListener e_corba_storage_get_StorageListener (ECorbaStorage *corba_storage) { g_return_val_if_fail (corba_storage != NULL, NULL); diff --git a/shell/e-corba-storage.h b/shell/e-corba-storage.h index 99ab23e97e..f37d41ad71 100644 --- a/shell/e-corba-storage.h +++ b/shell/e-corba-storage.h @@ -61,13 +61,13 @@ struct _ECorbaStorageClass { GtkType e_corba_storage_get_type (void); void e_corba_storage_construct (ECorbaStorage *corba_storage, - const Evolution_Storage storage_interface, + const GNOME_Evolution_Storage storage_interface, const char *name); -EStorage *e_corba_storage_new (const Evolution_Storage storage_interface, +EStorage *e_corba_storage_new (const GNOME_Evolution_Storage storage_interface, const char *name); /* FIXME: I don't like this call. */ -const Evolution_StorageListener e_corba_storage_get_StorageListener (ECorbaStorage *corba_storage); +const GNOME_Evolution_StorageListener e_corba_storage_get_StorageListener (ECorbaStorage *corba_storage); #ifdef __cplusplus } diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 852a6e2945..8da09893e5 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -650,11 +650,11 @@ e_local_storage_get_base_path (ELocalStorage *local_storage) } -const Evolution_LocalStorage +const GNOME_Evolution_LocalStorage e_local_storage_get_corba_interface (ELocalStorage *local_storage) { ELocalStoragePrivate *priv; - Evolution_LocalStorage corba_interface; + GNOME_Evolution_LocalStorage corba_interface; g_return_val_if_fail (local_storage != NULL, NULL); g_return_val_if_fail (E_IS_LOCAL_STORAGE (local_storage), NULL); diff --git a/shell/e-local-storage.h b/shell/e-local-storage.h index 4abb72077c..a7cb520ba1 100644 --- a/shell/e-local-storage.h +++ b/shell/e-local-storage.h @@ -66,7 +66,7 @@ EStorage *e_local_storage_open (EFolderTypeR const char *base_path); const char *e_local_storage_get_base_path (ELocalStorage *storage); -const Evolution_LocalStorage e_local_storage_get_corba_interface (ELocalStorage *storage); +const GNOME_Evolution_LocalStorage e_local_storage_get_corba_interface (ELocalStorage *storage); #ifdef __cplusplus } diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 0e68595fe9..9480dcac60 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -580,19 +580,6 @@ destroy (GtkObject *object) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } -/* Unrealize handler */ -static void -unrealize (GtkWidget *widget) -{ - /* We flush so that all the destroy window requests for foreign windows - * get sent over the X wire. Hopefully this will diminish the chance of - * hitting the CORBA (sync) vs. Xlib (async) race conditions. This is - * not the complete fix, which should actually be put in Bonobo and - * completed. FIXME. - */ - gdk_flush (); -} - static int delete_event (GtkWidget *widget, GdkEventAny *event) @@ -850,8 +837,6 @@ e_shell_view_construct (EShellView *shell_view, } window = GTK_OBJECT (view); - gtk_signal_connect_after (window, "unrealize", - (GtkSignalFunc) unrealize, NULL); gtk_signal_connect (window, "delete_event", (GtkSignalFunc) delete_event, NULL); @@ -1185,7 +1170,7 @@ get_control_for_uri (EShellView *shell_view, EFolder *folder; EvolutionShellComponentClient *handler_client; Bonobo_Control corba_control; - Evolution_ShellComponent handler; + GNOME_Evolution_ShellComponent handler; const char *path; const char *folder_type; GtkWidget *control; @@ -1225,7 +1210,7 @@ get_control_for_uri (EShellView *shell_view, CORBA_exception_init (&ev); - corba_control = Evolution_ShellComponent_create_view (handler, e_folder_get_physical_uri (folder), + corba_control = GNOME_Evolution_ShellComponent_createView (handler, e_folder_get_physical_uri (folder), folder_type, &ev); if (ev._major != CORBA_NO_EXCEPTION) { diff --git a/shell/e-shell.c b/shell/e-shell.c index ad6e2c1336..f9b42ba8e5 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -96,14 +96,14 @@ static void folder_selection_dialog_cancelled_cb (EShellFolderSelectionDialog *folder_selection_dialog, void *data) { - Evolution_FolderSelectionListener listener; + GNOME_Evolution_FolderSelectionListener listener; CORBA_Environment ev; listener = gtk_object_get_data (GTK_OBJECT (folder_selection_dialog), "corba_listener"); CORBA_exception_init (&ev); - Evolution_FolderSelectionListener_cancel (listener, &ev); + GNOME_Evolution_FolderSelectionListener_notifyCanceled (listener, &ev); CORBA_exception_free (&ev); @@ -117,7 +117,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ { CORBA_Environment ev; EShell *shell; - Evolution_FolderSelectionListener listener; + GNOME_Evolution_FolderSelectionListener listener; EStorageSet *storage_set; EFolder *folder; char *uri; @@ -138,7 +138,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ else physical_uri = e_folder_get_physical_uri (folder); - Evolution_FolderSelectionListener_selected (listener, uri, physical_uri, &ev); + GNOME_Evolution_FolderSelectionListener_notifySelected (listener, uri, physical_uri, &ev); g_free (uri); CORBA_exception_free (&ev); @@ -149,20 +149,20 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ /* CORBA interface implementation. */ -static POA_Evolution_Shell__vepv shell_vepv; +static POA_GNOME_Evolution_Shell__vepv shell_vepv; -static POA_Evolution_Shell * +static POA_GNOME_Evolution_Shell * create_servant (void) { - POA_Evolution_Shell *servant; + POA_GNOME_Evolution_Shell *servant; CORBA_Environment ev; - servant = (POA_Evolution_Shell *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Shell *) g_new0 (BonoboObjectServant, 1); servant->vepv = &shell_vepv; CORBA_exception_init (&ev); - POA_Evolution_Shell__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Shell__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -174,7 +174,7 @@ create_servant (void) return servant; } -static Evolution_ShellComponent +static GNOME_Evolution_ShellComponent impl_Shell_get_component_for_type (PortableServer_Servant servant, const CORBA_char *type, CORBA_Environment *ev) @@ -182,7 +182,7 @@ impl_Shell_get_component_for_type (PortableServer_Servant servant, BonoboObject *bonobo_object; EvolutionShellComponentClient *handler; EFolderTypeRegistry *folder_type_registry; - Evolution_ShellComponent corba_component; + GNOME_Evolution_ShellComponent corba_component; EShell *shell; bonobo_object = bonobo_object_from_servant (servant); @@ -192,7 +192,7 @@ impl_Shell_get_component_for_type (PortableServer_Servant servant, handler = e_folder_type_registry_get_handler_for_type (folder_type_registry, type); if (handler == NULL) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Evolution_Shell_NotFound, NULL); + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL); return CORBA_OBJECT_NIL; } @@ -206,9 +206,9 @@ static void corba_listener_destroy_notify (void *data) { CORBA_Environment ev; - Evolution_FolderSelectionListener listener_interface; + GNOME_Evolution_FolderSelectionListener listener_interface; - listener_interface = (Evolution_FolderSelectionListener) data; + listener_interface = (GNOME_Evolution_FolderSelectionListener) data; CORBA_exception_init (&ev); CORBA_Object_release (listener_interface, &ev); @@ -217,15 +217,15 @@ corba_listener_destroy_notify (void *data) static void impl_Shell_user_select_folder (PortableServer_Servant servant, - const Evolution_FolderSelectionListener listener, + const GNOME_Evolution_FolderSelectionListener listener, const CORBA_char *title, const CORBA_char *default_folder, - const Evolution_Shell_FolderTypeList *corba_allowed_types, + const GNOME_Evolution_Shell_FolderTypeList *corba_allowed_types, CORBA_Environment *ev) { GtkWidget *folder_selection_dialog; BonoboObject *bonobo_object; - Evolution_FolderSelectionListener listener_duplicate; + GNOME_Evolution_FolderSelectionListener listener_duplicate; EShell *shell; const char **allowed_types; int i; @@ -255,13 +255,13 @@ impl_Shell_user_select_folder (PortableServer_Servant servant, gtk_widget_show (folder_selection_dialog); } -static Evolution_LocalStorage +static GNOME_Evolution_LocalStorage impl_Shell_get_local_storage (PortableServer_Servant servant, CORBA_Environment *ev) { BonoboObject *bonobo_object; - Evolution_LocalStorage local_storage_interface; - Evolution_LocalStorage copy_of_local_storage_interface; + GNOME_Evolution_LocalStorage local_storage_interface; + GNOME_Evolution_LocalStorage copy_of_local_storage_interface; EShell *shell; EShellPrivate *priv; @@ -443,7 +443,7 @@ setup_components (EShell *shell, static void set_owner_on_components (EShell *shell) { - Evolution_Shell corba_shell; + GNOME_Evolution_Shell corba_shell; EShellPrivate *priv; const char *local_directory; GList *id_list; @@ -570,8 +570,8 @@ destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_Shell__vepv *vepv; - POA_Evolution_Shell__epv *epv; + POA_GNOME_Evolution_Shell__vepv *vepv; + POA_GNOME_Evolution_Shell__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -579,15 +579,15 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_Shell__epv, 1); - epv->get_component_for_type = impl_Shell_get_component_for_type; - epv->user_select_folder = impl_Shell_user_select_folder; - epv->get_local_storage = impl_Shell_get_local_storage; - epv->create_storage_set_view = impl_Shell_create_storage_set_view; + epv = g_new0 (POA_GNOME_Evolution_Shell__epv, 1); + epv->getComponentByType = impl_Shell_get_component_for_type; + epv->selectUserFolder = impl_Shell_user_select_folder; + epv->getLocalStorage = impl_Shell_get_local_storage; + epv->createStorageSetView = impl_Shell_create_storage_set_view; vepv = &shell_vepv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_Shell_epv = epv; + vepv->GNOME_Evolution_Shell_epv = epv; } static void @@ -647,7 +647,7 @@ init (EShell *shell) **/ void e_shell_construct (EShell *shell, - Evolution_Shell corba_object, + GNOME_Evolution_Shell corba_object, const char *local_directory, gboolean show_splash) { @@ -729,8 +729,8 @@ e_shell_new (const char *local_directory, { EShell *new; EShellPrivate *priv; - Evolution_Shell corba_object; - POA_Evolution_Shell *servant; + GNOME_Evolution_Shell corba_object; + POA_GNOME_Evolution_Shell *servant; g_return_val_if_fail (local_directory != NULL, NULL); g_return_val_if_fail (*local_directory != '\0', NULL); @@ -903,7 +903,7 @@ save_settings_for_component (EShell *shell, EvolutionShellComponentClient *client) { Bonobo_Unknown unknown_interface; - Evolution_Session session_interface; + GNOME_Evolution_Session session_interface; CORBA_Environment ev; char *prefix; gboolean retval; @@ -920,7 +920,7 @@ save_settings_for_component (EShell *shell, } prefix = g_strconcat ("/apps/Evolution/Shell/Components/", id, NULL); - Evolution_Session_save_configuration (session_interface, prefix, &ev); + GNOME_Evolution_Session_saveConfiguration (session_interface, prefix, &ev); if (ev._major == CORBA_NO_EXCEPTION) retval = TRUE; diff --git a/shell/e-shell.h b/shell/e-shell.h index 17444967a1..4eb5c2c462 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -66,7 +66,7 @@ struct _EShellClass { GtkType e_shell_get_type (void); void e_shell_construct (EShell *shell, - Evolution_Shell corba_object, + GNOME_Evolution_Shell corba_object, const char *local_directory, gboolean show_splash); diff --git a/shell/evolution-local-storage.c b/shell/evolution-local-storage.c index d1460488df..cec05b91fc 100644 --- a/shell/evolution-local-storage.c +++ b/shell/evolution-local-storage.c @@ -50,10 +50,10 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* CORBA interface implementation. */ -static POA_Evolution_LocalStorage__vepv LocalStorage_vepv; +static POA_GNOME_Evolution_LocalStorage__vepv LocalStorage_vepv; static void -impl_Evolution_LocalStorage_update_folder (PortableServer_Servant servant, +impl_GNOME_Evolution_LocalStorage_updateFolder (PortableServer_Servant servant, const CORBA_char *path, const CORBA_char *display_name, CORBA_boolean highlighted, @@ -68,18 +68,18 @@ impl_Evolution_LocalStorage_update_folder (PortableServer_Servant servant, gtk_signal_emit (GTK_OBJECT (local_storage), signals[UPDATE_FOLDER], path, display_name, highlighted); } -static POA_Evolution_LocalStorage * +static POA_GNOME_Evolution_LocalStorage * create_servant (void) { - POA_Evolution_LocalStorage *servant; + POA_GNOME_Evolution_LocalStorage *servant; CORBA_Environment ev; - servant = (POA_Evolution_LocalStorage *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_LocalStorage *) g_new0 (BonoboObjectServant, 1); servant->vepv = &LocalStorage_vepv; CORBA_exception_init (&ev); - POA_Evolution_LocalStorage__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_LocalStorage__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -112,7 +112,7 @@ impl_destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_LocalStorage__vepv *vepv; + POA_GNOME_Evolution_LocalStorage__vepv *vepv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -122,8 +122,8 @@ corba_class_init (void) vepv = &LocalStorage_vepv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_Storage_epv = evolution_storage_get_epv (); - vepv->Evolution_LocalStorage_epv = evolution_local_storage_get_epv (); + vepv->GNOME_Evolution_Storage_epv = evolution_storage_get_epv (); + vepv->GNOME_Evolution_LocalStorage_epv = evolution_local_storage_get_epv (); } static void @@ -163,20 +163,20 @@ init (EvolutionLocalStorage *local_storage) } -POA_Evolution_LocalStorage__epv * +POA_GNOME_Evolution_LocalStorage__epv * evolution_local_storage_get_epv (void) { - POA_Evolution_LocalStorage__epv *epv; + POA_GNOME_Evolution_LocalStorage__epv *epv; - epv = g_new0 (POA_Evolution_LocalStorage__epv, 1); - epv->update_folder = impl_Evolution_LocalStorage_update_folder; + epv = g_new0 (POA_GNOME_Evolution_LocalStorage__epv, 1); + epv->updateFolder = impl_GNOME_Evolution_LocalStorage_updateFolder; return epv; } void evolution_local_storage_construct (EvolutionLocalStorage *local_storage, - Evolution_LocalStorage corba_object, + GNOME_Evolution_LocalStorage corba_object, const char *name) { g_return_if_fail (local_storage != NULL); @@ -192,8 +192,8 @@ EvolutionLocalStorage * evolution_local_storage_new (const char *name) { EvolutionLocalStorage *new; - POA_Evolution_LocalStorage *servant; - Evolution_LocalStorage corba_object; + POA_GNOME_Evolution_LocalStorage *servant; + GNOME_Evolution_LocalStorage corba_object; g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (name[0] != '\0', NULL); diff --git a/shell/evolution-local-storage.h b/shell/evolution-local-storage.h index a97b0b7e81..33872ad60b 100644 --- a/shell/evolution-local-storage.h +++ b/shell/evolution-local-storage.h @@ -64,11 +64,11 @@ struct _EvolutionLocalStorageClass { }; -POA_Evolution_LocalStorage__epv *evolution_local_storage_get_epv (void); +POA_GNOME_Evolution_LocalStorage__epv *evolution_local_storage_get_epv (void); GtkType evolution_local_storage_get_type (void); void evolution_local_storage_construct (EvolutionLocalStorage *local_storage, - Evolution_LocalStorage corba_object, + GNOME_Evolution_LocalStorage corba_object, const char *name); EvolutionLocalStorage *evolution_local_storage_new (const char *name); diff --git a/shell/evolution-session.c b/shell/evolution-session.c index a53d98243f..d512ab1656 100644 --- a/shell/evolution-session.c +++ b/shell/evolution-session.c @@ -70,7 +70,7 @@ impl_destroy (GtkObject *object) /* CORBA interface implementation. */ static void -impl_Evolution_Session_save_configuration (PortableServer_Servant servant, +impl_GNOME_Evolution_Session_saveConfiguration (PortableServer_Servant servant, const CORBA_char *prefix, CORBA_Environment *ev) { @@ -81,7 +81,7 @@ impl_Evolution_Session_save_configuration (PortableServer_Servant servant, } static void -impl_Evolution_Session_load_configuration (PortableServer_Servant servant, +impl_GNOME_Evolution_Session_loadConfiguration (PortableServer_Servant servant, const CORBA_char *prefix, CORBA_Environment *ev) { @@ -94,13 +94,13 @@ impl_Evolution_Session_load_configuration (PortableServer_Servant servant, /* Initialization. */ -static POA_Evolution_Session__vepv Evolution_Session_vepv; +static POA_GNOME_Evolution_Session__vepv GNOME_Evolution_Session_vepv; static void corba_class_init (void) { - POA_Evolution_Session__vepv *vepv; - POA_Evolution_Session__epv *epv; + POA_GNOME_Evolution_Session__vepv *vepv; + POA_GNOME_Evolution_Session__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -108,14 +108,14 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_Session__epv, 1); - epv->save_configuration = impl_Evolution_Session_save_configuration; - epv->load_configuration = impl_Evolution_Session_load_configuration; + epv = g_new0 (POA_GNOME_Evolution_Session__epv, 1); + epv->saveConfiguration = impl_GNOME_Evolution_Session_saveConfiguration; + epv->loadConfiguration = impl_GNOME_Evolution_Session_loadConfiguration; - vepv = &Evolution_Session_vepv; + vepv = &GNOME_Evolution_Session_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_Session_epv = epv; + vepv->GNOME_Evolution_Session_epv = epv; } static void @@ -161,18 +161,18 @@ init (EvolutionSession *session) } -static Evolution_Session +static GNOME_Evolution_Session create_corba_session (BonoboObject *object) { - POA_Evolution_Session *servant; + POA_GNOME_Evolution_Session *servant; CORBA_Environment ev; - servant = (POA_Evolution_Session *) g_new0 (BonoboObjectServant, 1); - servant->vepv = &Evolution_Session_vepv; + servant = (POA_GNOME_Evolution_Session *) g_new0 (BonoboObjectServant, 1); + servant->vepv = &GNOME_Evolution_Session_vepv; CORBA_exception_init (&ev); - POA_Evolution_Session__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Session__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION){ g_free (servant); CORBA_exception_free (&ev); @@ -180,7 +180,7 @@ create_corba_session (BonoboObject *object) } CORBA_exception_free (&ev); - return (Evolution_Session) bonobo_object_activate_servant (object, servant); + return (GNOME_Evolution_Session) bonobo_object_activate_servant (object, servant); } void @@ -197,7 +197,7 @@ EvolutionSession * evolution_session_new (void) { EvolutionSession *session; - Evolution_Session corba_session; + GNOME_Evolution_Session corba_session; session = gtk_type_new (evolution_session_get_type ()); diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c index 7e32883439..f5cc3ef15c 100644 --- a/shell/evolution-shell-client.c +++ b/shell/evolution-shell-client.c @@ -43,12 +43,12 @@ static BonoboObjectClientClass *parent_class = NULL; /* Easy-to-use wrapper for Evolution::user_select_folder. */ static PortableServer_ServantBase__epv FolderSelectionListener_base_epv; -static POA_Evolution_FolderSelectionListener__epv FolderSelectionListener_epv; -static POA_Evolution_FolderSelectionListener__vepv FolderSelectionListener_vepv; +static POA_GNOME_Evolution_FolderSelectionListener__epv FolderSelectionListener_epv; +static POA_GNOME_Evolution_FolderSelectionListener__vepv FolderSelectionListener_vepv; static gboolean FolderSelectionListener_vtables_initialized = FALSE; struct _FolderSelectionListenerServant { - POA_Evolution_FolderSelectionListener servant; + POA_GNOME_Evolution_FolderSelectionListener servant; char **uri_return; char **physical_uri_return; }; @@ -97,21 +97,21 @@ init_FolderSelectionListener_vtables (void) FolderSelectionListener_base_epv.finalize = NULL; FolderSelectionListener_base_epv.default_POA = NULL; - FolderSelectionListener_epv.selected = impl_FolderSelectionListener_selected; - FolderSelectionListener_epv.cancel = impl_FolderSelectionListener_cancel; + FolderSelectionListener_epv.notifySelected = impl_FolderSelectionListener_selected; + FolderSelectionListener_epv.notifyCanceled = impl_FolderSelectionListener_cancel; FolderSelectionListener_vepv._base_epv = &FolderSelectionListener_base_epv; - FolderSelectionListener_vepv.Evolution_FolderSelectionListener_epv = &FolderSelectionListener_epv; + FolderSelectionListener_vepv.GNOME_Evolution_FolderSelectionListener_epv = &FolderSelectionListener_epv; FolderSelectionListener_vtables_initialized = TRUE; } -static Evolution_FolderSelectionListener +static GNOME_Evolution_FolderSelectionListener create_folder_selection_listener_interface (char **result, char **uri_return, char **physical_uri_return) { - Evolution_FolderSelectionListener corba_interface; + GNOME_Evolution_FolderSelectionListener corba_interface; CORBA_Environment ev; FolderSelectionListenerServant *servant; PortableServer_Servant listener_servant; @@ -128,7 +128,7 @@ create_folder_selection_listener_interface (char **result, CORBA_exception_init (&ev); - POA_Evolution_FolderSelectionListener__init (listener_servant, &ev); + POA_GNOME_Evolution_FolderSelectionListener__init (listener_servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free(servant); return CORBA_OBJECT_NIL; @@ -167,10 +167,10 @@ user_select_folder (EvolutionShellClient *shell_client, char **uri_return, char **physical_uri_return) { - Evolution_FolderSelectionListener listener_interface; - Evolution_Shell corba_shell; + GNOME_Evolution_FolderSelectionListener listener_interface; + GNOME_Evolution_Shell corba_shell; CORBA_Environment ev; - Evolution_Shell_FolderTypeList corba_type_list; + GNOME_Evolution_Shell_FolderTypeList corba_type_list; int num_possible_types; char *result; @@ -191,7 +191,7 @@ user_select_folder (EvolutionShellClient *shell_client, corba_type_list._maximum = num_possible_types; corba_type_list._buffer = (CORBA_char **) possible_types; - Evolution_Shell_user_select_folder (corba_shell, listener_interface, + GNOME_Evolution_Shell_selectUserFolder (corba_shell, listener_interface, title, default_folder, &corba_type_list, &ev); @@ -264,7 +264,7 @@ init (EvolutionShellClient *shell_client) **/ void evolution_shell_client_construct (EvolutionShellClient *shell_client, - Evolution_Shell corba_shell) + GNOME_Evolution_Shell corba_shell) { g_return_if_fail (shell_client != NULL); g_return_if_fail (EVOLUTION_IS_SHELL_CLIENT (shell_client)); @@ -282,7 +282,7 @@ evolution_shell_client_construct (EvolutionShellClient *shell_client, * Return value: A pointer to the Evolution::Shell client BonoboObject. **/ EvolutionShellClient * -evolution_shell_client_new (Evolution_Shell corba_shell) +evolution_shell_client_new (GNOME_Evolution_Shell corba_shell) { EvolutionShellClient *shell_client; @@ -339,11 +339,11 @@ evolution_shell_client_user_select_folder (EvolutionShellClient *shell_client, * Return value: a pointer to the CORBA object implementing the local storage * in the shell associated with @shell_client. **/ -Evolution_LocalStorage +GNOME_Evolution_LocalStorage evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client) { - Evolution_Shell corba_shell; - Evolution_LocalStorage corba_local_storage; + GNOME_Evolution_Shell corba_shell; + GNOME_Evolution_LocalStorage corba_local_storage; CORBA_Environment ev; g_return_val_if_fail (shell_client != NULL, CORBA_OBJECT_NIL); @@ -355,7 +355,7 @@ evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client) if (corba_shell == CORBA_OBJECT_NIL) return CORBA_OBJECT_NIL; - corba_local_storage = Evolution_Shell_get_local_storage (corba_shell, &ev); + corba_local_storage = GNOME_Evolution_Shell_getLocalStorage (corba_shell, &ev); if (ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); return CORBA_OBJECT_NIL; diff --git a/shell/evolution-shell-client.h b/shell/evolution-shell-client.h index 151f18f9b7..0a2ee67ab8 100644 --- a/shell/evolution-shell-client.h +++ b/shell/evolution-shell-client.h @@ -61,8 +61,8 @@ struct _EvolutionShellClientClass { GtkType evolution_shell_client_get_type (void); void evolution_shell_client_construct (EvolutionShellClient *shell_client, - Evolution_Shell corba_shell); -EvolutionShellClient *evolution_shell_client_new (Evolution_Shell shell); + GNOME_Evolution_Shell corba_shell); +EvolutionShellClient *evolution_shell_client_new (GNOME_Evolution_Shell shell); void evolution_shell_client_user_select_folder (EvolutionShellClient *shell_client, const char *title, @@ -71,7 +71,7 @@ void evolution_shell_client_user_select_folder (EvolutionShe char **uri_return, char **physical_uri_return); -Evolution_LocalStorage evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client); +GNOME_Evolution_LocalStorage evolution_shell_client_get_local_storage (EvolutionShellClient *shell_client); #ifdef __cplusplus } diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c index 26b2733620..6a96bc3b33 100644 --- a/shell/evolution-shell-component-client.c +++ b/shell/evolution-shell-component-client.c @@ -45,7 +45,7 @@ struct _EvolutionShellComponentClientPrivate { EvolutionShellComponentClientCallback callback; void *callback_data; - Evolution_ShellComponentListener listener_interface; + GNOME_Evolution_ShellComponentListener listener_interface; PortableServer_Servant listener_servant; }; @@ -63,17 +63,17 @@ corba_exception_to_result (const CORBA_Environment *ev) return EVOLUTION_SHELL_COMPONENT_OK; if (ev->_major == CORBA_USER_EXCEPTION) { - if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_AlreadyOwned) == 0) + if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_AlreadyOwned) == 0) return EVOLUTION_SHELL_COMPONENT_ALREADYOWNED; - if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_NotOwned) == 0) + if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_NotOwned) == 0) return EVOLUTION_SHELL_COMPONENT_NOTOWNED; - if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_NotFound) == 0) + if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_NotFound) == 0) return EVOLUTION_SHELL_COMPONENT_NOTFOUND; - if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_UnsupportedType) == 0) + if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_UnsupportedType) == 0) return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE; - if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_InternalError) == 0) + if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_InternalError) == 0) return EVOLUTION_SHELL_COMPONENT_INTERNALERROR; - if (strcmp (ev->_repo_id, ex_Evolution_ShellComponent_Busy) == 0) + if (strcmp (ev->_repo_id, ex_GNOME_Evolution_ShellComponent_Busy) == 0) return EVOLUTION_SHELL_COMPONENT_BUSY; return EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR; @@ -105,7 +105,7 @@ dispatch_callback (EvolutionShellComponentClient *shell_component_client, oid = PortableServer_POA_servant_to_id (bonobo_poa (), priv->listener_servant, &ev); PortableServer_POA_deactivate_object (bonobo_poa (), oid, &ev); - POA_Evolution_ShellComponentListener__fini (priv->listener_servant, &ev); + POA_GNOME_Evolution_ShellComponentListener__fini (priv->listener_servant, &ev); CORBA_free (oid); CORBA_Object_release (priv->listener_interface, &ev); @@ -128,12 +128,12 @@ dispatch_callback (EvolutionShellComponentClient *shell_component_client, /* CORBA listener interface implementation. */ static PortableServer_ServantBase__epv ShellComponentListener_base_epv; -static POA_Evolution_ShellComponentListener__epv ShellComponentListener_epv; -static POA_Evolution_ShellComponentListener__vepv ShellComponentListener_vepv; +static POA_GNOME_Evolution_ShellComponentListener__epv ShellComponentListener_epv; +static POA_GNOME_Evolution_ShellComponentListener__vepv ShellComponentListener_vepv; static gboolean ShellComponentListener_vepv_initialized = FALSE; struct _ShellComponentListenerServant { - POA_Evolution_ShellComponentListener servant; + POA_GNOME_Evolution_ShellComponentListener servant; EvolutionShellComponentClient *component_client; }; typedef struct _ShellComponentListenerServant ShellComponentListenerServant; @@ -148,22 +148,22 @@ component_client_from_ShellComponentListener_servant (PortableServer_Servant ser } static EvolutionShellComponentResult -result_from_async_corba_result (Evolution_ShellComponentListener_Result async_corba_result) +result_from_async_corba_result (GNOME_Evolution_ShellComponentListener_Result async_corba_result) { switch (async_corba_result) { - case Evolution_ShellComponentListener_OK: + case GNOME_Evolution_ShellComponentListener_OK: return EVOLUTION_SHELL_COMPONENT_OK; - case Evolution_ShellComponentListener_UNSUPPORTED_OPERATION: + case GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION: return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDOPERATION; - case Evolution_ShellComponentListener_EXISTS: + case GNOME_Evolution_ShellComponentListener_EXISTS: return EVOLUTION_SHELL_COMPONENT_EXISTS; - case Evolution_ShellComponentListener_INVALID_URI: + case GNOME_Evolution_ShellComponentListener_INVALID_URI: return EVOLUTION_SHELL_COMPONENT_INVALIDURI; - case Evolution_ShellComponentListener_PERMISSION_DENIED: + case GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED: return EVOLUTION_SHELL_COMPONENT_PERMISSIONDENIED; - case Evolution_ShellComponentListener_HAS_SUBFOLDERS: + case GNOME_Evolution_ShellComponentListener_HAS_SUBFOLDERS: return EVOLUTION_SHELL_COMPONENT_HASSUBFOLDERS; - case Evolution_ShellComponentListener_NO_SPACE: + case GNOME_Evolution_ShellComponentListener_NO_SPACE: return EVOLUTION_SHELL_COMPONENT_NOSPACE; default: return EVOLUTION_SHELL_COMPONENT_UNKNOWNERROR; @@ -172,7 +172,7 @@ result_from_async_corba_result (Evolution_ShellComponentListener_Result async_co static void impl_ShellComponentListener_report_result (PortableServer_Servant servant, - const Evolution_ShellComponentListener_Result result, + const GNOME_Evolution_ShellComponentListener_Result result, CORBA_Environment *ev) { EvolutionShellComponentClient *component_client; @@ -188,10 +188,10 @@ ShellComponentListener_vepv_initialize (void) ShellComponentListener_base_epv.finalize = NULL; ShellComponentListener_base_epv.default_POA = NULL; - ShellComponentListener_epv.report_result = impl_ShellComponentListener_report_result; + ShellComponentListener_epv.notifyResult = impl_ShellComponentListener_report_result; ShellComponentListener_vepv._base_epv = & ShellComponentListener_base_epv; - ShellComponentListener_vepv.Evolution_ShellComponentListener_epv = & ShellComponentListener_epv; + ShellComponentListener_vepv.GNOME_Evolution_ShellComponentListener_epv = & ShellComponentListener_epv; ShellComponentListener_vepv_initialized = TRUE; } @@ -222,7 +222,7 @@ create_listener_interface (EvolutionShellComponentClient *shell_component_client { EvolutionShellComponentClientPrivate *priv; PortableServer_Servant listener_servant; - Evolution_ShellComponentListener corba_interface; + GNOME_Evolution_ShellComponentListener corba_interface; CORBA_Environment ev; priv = shell_component_client->priv; @@ -231,7 +231,7 @@ create_listener_interface (EvolutionShellComponentClient *shell_component_client CORBA_exception_init (&ev); - POA_Evolution_ShellComponentListener__init (listener_servant, &ev); + POA_GNOME_Evolution_ShellComponentListener__init (listener_servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { free_ShellComponentListener_servant (listener_servant); return; @@ -349,7 +349,7 @@ evolution_shell_component_client_new (const char *id) EvolutionShellComponentResult evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell_component_client, - Evolution_Shell shell, + GNOME_Evolution_Shell shell, const char *evolution_homedir) { EvolutionShellComponentResult result; @@ -361,7 +361,7 @@ evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell CORBA_exception_init (&ev); - Evolution_ShellComponent_set_owner (bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)), + GNOME_Evolution_ShellComponent_setOwner (bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)), shell, evolution_homedir, &ev); result = corba_exception_to_result (&ev); @@ -373,10 +373,10 @@ evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell EvolutionShellComponentResult evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *shell_component_client, - Evolution_Shell shell) + GNOME_Evolution_Shell shell) { EvolutionShellComponentResult result; - Evolution_ShellComponent corba_component; + GNOME_Evolution_ShellComponent corba_component; CORBA_Environment ev; RETURN_ERROR_IF_FAIL (shell_component_client != NULL); @@ -387,7 +387,7 @@ evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *she corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)); - Evolution_ShellComponent_unset_owner (corba_component, &ev); + GNOME_Evolution_ShellComponent_unsetOwner (corba_component, &ev); result = corba_exception_to_result (&ev); @@ -405,7 +405,7 @@ evolution_shell_component_client_create_view (EvolutionShellComponentClient *she { EvolutionShellComponentResult result; CORBA_Environment ev; - Evolution_ShellComponent corba_component; + GNOME_Evolution_ShellComponent corba_component; Bonobo_Control corba_control; RETURN_ERROR_IF_FAIL (shell_component_client != NULL); @@ -419,7 +419,7 @@ evolution_shell_component_client_create_view (EvolutionShellComponentClient *she CORBA_exception_init (&ev); corba_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)); - corba_control = Evolution_ShellComponent_create_view (corba_component, physical_uri, type_string, &ev); + corba_control = GNOME_Evolution_ShellComponent_createView (corba_component, physical_uri, type_string, &ev); result = corba_exception_to_result (&ev); @@ -449,7 +449,7 @@ evolution_shell_component_client_async_create_folder (EvolutionShellComponentCli void *data) { EvolutionShellComponentClientPrivate *priv; - Evolution_ShellComponent corba_shell_component; + GNOME_Evolution_ShellComponent corba_shell_component; CORBA_Environment ev; g_return_if_fail (shell_component_client != NULL); @@ -474,10 +474,10 @@ evolution_shell_component_client_async_create_folder (EvolutionShellComponentCli priv->callback = callback; priv->callback_data = data; - Evolution_ShellComponent_async_create_folder (corba_shell_component, - priv->listener_interface, - physical_uri, type, - &ev); + GNOME_Evolution_ShellComponent_addFolderAsync (corba_shell_component, + priv->listener_interface, + physical_uri, type, + &ev); CORBA_exception_free (&ev); } @@ -499,7 +499,7 @@ evolution_shell_component_client_populate_folder_context_menu (EvolutionShellCom { Bonobo_UIContainer corba_uih; EvolutionShellComponentClientPrivate *priv; - Evolution_ShellComponent corba_shell_component; + GNOME_Evolution_ShellComponent corba_shell_component; CORBA_Environment ev; g_return_if_fail (shell_component_client != NULL); @@ -514,7 +514,7 @@ evolution_shell_component_client_populate_folder_context_menu (EvolutionShellCom corba_shell_component = bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)); corba_uih = bonobo_object_corba_objref (BONOBO_OBJECT (uih)); - Evolution_ShellComponent_populate_folder_context_menu (corba_shell_component, + GNOME_Evolution_ShellComponent_populateFolderContextMenu (corba_shell_component, corba_uih, physical_uri, type, diff --git a/shell/evolution-shell-component-client.h b/shell/evolution-shell-component-client.h index 1a0eab5cd7..621e5cda49 100644 --- a/shell/evolution-shell-component-client.h +++ b/shell/evolution-shell-component-client.h @@ -67,10 +67,10 @@ EvolutionShellComponentClient *evolution_shell_component_client_new (cons /* Synchronous operations. */ EvolutionShellComponentResult evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell_component_client, - Evolution_Shell shell, + GNOME_Evolution_Shell shell, const char *evolution_homedir); EvolutionShellComponentResult evolution_shell_component_client_unset_owner (EvolutionShellComponentClient *shell_component_client, - Evolution_Shell shell); + GNOME_Evolution_Shell shell); EvolutionShellComponentResult evolution_shell_component_client_create_view (EvolutionShellComponentClient *shell_component_client, BonoboUIComponent *uih, const char *physical_uri, diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index 8e149f11fb..790bbb7d3c 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -61,20 +61,20 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* CORBA interface implementation. */ -static POA_Evolution_ShellComponent__vepv ShellComponent_vepv; +static POA_GNOME_Evolution_ShellComponent__vepv ShellComponent_vepv; -static POA_Evolution_ShellComponent * +static POA_GNOME_Evolution_ShellComponent * create_servant (void) { - POA_Evolution_ShellComponent *servant; + POA_GNOME_Evolution_ShellComponent *servant; CORBA_Environment ev; - servant = (POA_Evolution_ShellComponent *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_ShellComponent *) g_new0 (BonoboObjectServant, 1); servant->vepv = &ShellComponent_vepv; CORBA_exception_init (&ev); - POA_Evolution_ShellComponent__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_ShellComponent__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -86,14 +86,14 @@ create_servant (void) return servant; } -static Evolution_FolderTypeList * +static GNOME_Evolution_FolderTypeList * impl_ShellComponent__get_supported_types (PortableServer_Servant servant, CORBA_Environment *ev) { BonoboObject *bonobo_object; EvolutionShellComponent *shell_component; EvolutionShellComponentPrivate *priv; - Evolution_FolderTypeList *folder_type_list; + GNOME_Evolution_FolderTypeList *folder_type_list; unsigned int i; GList *p; @@ -101,13 +101,13 @@ impl_ShellComponent__get_supported_types (PortableServer_Servant servant, shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object); priv = shell_component->priv; - folder_type_list = Evolution_FolderTypeList__alloc (); + folder_type_list = GNOME_Evolution_FolderTypeList__alloc (); folder_type_list->_length = g_list_length (priv->folder_types); folder_type_list->_maximum = folder_type_list->_length; - folder_type_list->_buffer = CORBA_sequence_Evolution_FolderType_allocbuf (folder_type_list->_maximum); + folder_type_list->_buffer = CORBA_sequence_GNOME_Evolution_FolderType_allocbuf (folder_type_list->_maximum); for (p = priv->folder_types, i = 0; p != NULL; p = p->next, i++) { - Evolution_FolderType *corba_folder_type; + GNOME_Evolution_FolderType *corba_folder_type; EvolutionShellComponentFolderType *folder_type; folder_type = (EvolutionShellComponentFolderType *) p->data; @@ -122,14 +122,14 @@ impl_ShellComponent__get_supported_types (PortableServer_Servant servant, static void impl_ShellComponent_set_owner (PortableServer_Servant servant, - const Evolution_Shell shell, + const GNOME_Evolution_Shell shell, const CORBA_char *evolution_homedir, CORBA_Environment *ev) { BonoboObject *bonobo_object; EvolutionShellComponent *shell_component; EvolutionShellComponentPrivate *priv; - Evolution_Shell shell_duplicate; + GNOME_Evolution_Shell shell_duplicate; bonobo_object = bonobo_object_from_servant (servant); shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object); @@ -137,7 +137,7 @@ impl_ShellComponent_set_owner (PortableServer_Servant servant, if (priv->owner_client != NULL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_ShellComponent_AlreadyOwned, NULL); + ex_GNOME_Evolution_ShellComponent_AlreadyOwned, NULL); return; } @@ -163,7 +163,7 @@ impl_ShellComponent_unset_owner (PortableServer_Servant servant, if (priv->owner_client == NULL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_ShellComponent_NotOwned, NULL); + ex_GNOME_Evolution_ShellComponent_NotOwned, NULL); return; } @@ -196,17 +196,17 @@ impl_ShellComponent_create_view (PortableServer_Servant servant, switch (result) { case EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE: CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_ShellComponent_UnsupportedType, + ex_GNOME_Evolution_ShellComponent_UnsupportedType, NULL); break; case EVOLUTION_SHELL_COMPONENT_INTERNALERROR: CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_ShellComponent_InternalError, + ex_GNOME_Evolution_ShellComponent_InternalError, NULL); break; default: CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_ShellComponent_NotFound, + ex_GNOME_Evolution_ShellComponent_NotFound, NULL); } @@ -218,7 +218,7 @@ impl_ShellComponent_create_view (PortableServer_Servant servant, static void impl_ShellComponent_async_create_folder (PortableServer_Servant servant, - const Evolution_ShellComponentListener listener, + const GNOME_Evolution_ShellComponentListener listener, const CORBA_char *physical_uri, const CORBA_char *type, CORBA_Environment *ev) @@ -232,8 +232,8 @@ impl_ShellComponent_async_create_folder (PortableServer_Servant servant, priv = shell_component->priv; if (priv->create_folder_fn == NULL) { - Evolution_ShellComponentListener_report_result (listener, - Evolution_ShellComponentListener_UNSUPPORTED_OPERATION, + GNOME_Evolution_ShellComponentListener_notifyResult (listener, + GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION, ev); return; } @@ -243,7 +243,7 @@ impl_ShellComponent_async_create_folder (PortableServer_Servant servant, static void impl_ShellComponent_async_remove_folder (PortableServer_Servant servant, - const Evolution_ShellComponentListener listener, + const GNOME_Evolution_ShellComponentListener listener, const CORBA_char *physical_uri, CORBA_Environment *ev) { @@ -256,8 +256,8 @@ impl_ShellComponent_async_remove_folder (PortableServer_Servant servant, priv = shell_component->priv; if (priv->remove_folder_fn == NULL) { - Evolution_ShellComponentListener_report_result (listener, - Evolution_ShellComponentListener_UNSUPPORTED_OPERATION, + GNOME_Evolution_ShellComponentListener_notifyResult (listener, + GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION, ev); return; } @@ -337,8 +337,8 @@ destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_ShellComponent__vepv *vepv; - POA_Evolution_ShellComponent__epv *epv; + POA_GNOME_Evolution_ShellComponent__vepv *vepv; + POA_GNOME_Evolution_ShellComponent__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -346,19 +346,19 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_ShellComponent__epv, 1); - epv->_get_supported_types = impl_ShellComponent__get_supported_types; - epv->set_owner = impl_ShellComponent_set_owner; - epv->unset_owner = impl_ShellComponent_unset_owner; - epv->create_view = impl_ShellComponent_create_view; - epv->async_create_folder = impl_ShellComponent_async_create_folder; - epv->async_remove_folder = impl_ShellComponent_async_remove_folder; - epv->populate_folder_context_menu = impl_ShellComponent_populate_folder_context_menu; + epv = g_new0 (POA_GNOME_Evolution_ShellComponent__epv, 1); + epv->_get_supported_types = impl_ShellComponent__get_supported_types; + epv->setOwner = impl_ShellComponent_set_owner; + epv->unsetOwner = impl_ShellComponent_unset_owner; + epv->createView = impl_ShellComponent_create_view; + epv->addFolderAsync = impl_ShellComponent_async_create_folder; + epv->removeFolderAsync = impl_ShellComponent_async_remove_folder; + epv->populateFolderContextMenu = impl_ShellComponent_populate_folder_context_menu; vepv = &ShellComponent_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_ShellComponent_epv = epv; + vepv->GNOME_Evolution_ShellComponent_epv = epv; } static void @@ -416,7 +416,7 @@ init (EvolutionShellComponent *shell_component) void evolution_shell_component_construct (EvolutionShellComponent *shell_component, const EvolutionShellComponentFolderType folder_types[], - Evolution_ShellComponent corba_object, + GNOME_Evolution_ShellComponent corba_object, EvolutionShellComponentCreateViewFn create_view_fn, EvolutionShellComponentCreateFolderFn create_folder_fn, EvolutionShellComponentRemoveFolderFn remove_folder_fn, @@ -468,8 +468,8 @@ evolution_shell_component_new (const EvolutionShellComponentFolderType folder_ty void *closure) { EvolutionShellComponent *new; - POA_Evolution_ShellComponent *servant; - Evolution_ShellComponent corba_object; + POA_GNOME_Evolution_ShellComponent *servant; + GNOME_Evolution_ShellComponent corba_object; servant = create_servant (); if (servant == NULL) diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h index bceb6a47cf..8b627deebe 100644 --- a/shell/evolution-shell-component.h +++ b/shell/evolution-shell-component.h @@ -81,11 +81,11 @@ typedef EvolutionShellComponentResult (* EvolutionShellComponentCreateViewFn) typedef void (* EvolutionShellComponentCreateFolderFn) (EvolutionShellComponent *shell_component, const char *physical_uri, const char *type, - const Evolution_ShellComponentListener listener, + const GNOME_Evolution_ShellComponentListener listener, void *closure); typedef void (* EvolutionShellComponentRemoveFolderFn) (EvolutionShellComponent *shell_component, const char *physical_uri, - const Evolution_ShellComponentListener listener, + const GNOME_Evolution_ShellComponentListener listener, void *closure); typedef void (* EvolutionShellComponentPopulateFolderContextMenu) (EvolutionShellComponent *shell_component, BonoboUIComponent *uic, @@ -120,7 +120,7 @@ struct _EvolutionShellComponentClass { GtkType evolution_shell_component_get_type (void); void evolution_shell_component_construct (EvolutionShellComponent *shell_component, const EvolutionShellComponentFolderType folder_types[], - Evolution_ShellComponent corba_object, + GNOME_Evolution_ShellComponent corba_object, EvolutionShellComponentCreateViewFn create_view_fn, EvolutionShellComponentCreateFolderFn create_folder_fn, EvolutionShellComponentRemoveFolderFn remove_folder_fn, diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c index c9fbb74ba8..9e001f6957 100644 --- a/shell/evolution-shell-view.c +++ b/shell/evolution-shell-view.c @@ -52,19 +52,19 @@ static int signals[LAST_SIGNAL] = { 0 }; /* CORBA interface implementation. */ -static POA_Evolution_ShellView__vepv ShellView_vepv; +static POA_GNOME_Evolution_ShellView__vepv ShellView_vepv; -static POA_Evolution_ShellView * +static POA_GNOME_Evolution_ShellView * create_servant (void) { - POA_Evolution_ShellView *servant; + POA_GNOME_Evolution_ShellView *servant; CORBA_Environment ev; - servant = (POA_Evolution_ShellView *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_ShellView *) g_new0 (BonoboObjectServant, 1); servant->vepv = &ShellView_vepv; CORBA_exception_init (&ev); - POA_Evolution_ShellView__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_ShellView__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -142,8 +142,8 @@ destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_ShellView__vepv *vepv; - POA_Evolution_ShellView__epv *epv; + POA_GNOME_Evolution_ShellView__vepv *vepv; + POA_GNOME_Evolution_ShellView__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -151,16 +151,16 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_ShellView__epv, 1); - epv->set_message = impl_ShellView_set_message; - epv->unset_message = impl_ShellView_unset_message; - epv->change_current_view = impl_ShellView_change_current_view; - epv->set_title = impl_ShellView_set_title; + epv = g_new0 (POA_GNOME_Evolution_ShellView__epv, 1); + epv->setMessage = impl_ShellView_set_message; + epv->unsetMessage = impl_ShellView_unset_message; + epv->changeCurrentView = impl_ShellView_change_current_view; + epv->setTitle = impl_ShellView_set_title; vepv = &ShellView_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_ShellView_epv = epv; + vepv->GNOME_Evolution_ShellView_epv = epv; } static void @@ -235,7 +235,7 @@ init (EvolutionShellView *shell_view) **/ void evolution_shell_view_construct (EvolutionShellView *shell_view, - Evolution_ShellView corba_object) + GNOME_Evolution_ShellView corba_object) { g_return_if_fail (shell_view != NULL); g_return_if_fail (EVOLUTION_IS_SHELL_VIEW (shell_view)); @@ -253,8 +253,8 @@ evolution_shell_view_construct (EvolutionShellView *shell_view, EvolutionShellView * evolution_shell_view_new (void) { - POA_Evolution_ShellView *servant; - Evolution_ShellView corba_object; + POA_GNOME_Evolution_ShellView *servant; + GNOME_Evolution_ShellView corba_object; EvolutionShellView *new; servant = create_servant (); diff --git a/shell/evolution-shell-view.h b/shell/evolution-shell-view.h index 546a1a9640..928d22b4c8 100644 --- a/shell/evolution-shell-view.h +++ b/shell/evolution-shell-view.h @@ -67,8 +67,8 @@ struct _EvolutionShellViewClass { GtkType evolution_shell_view_get_type (void); -void evolution_shell_view_construct (EvolutionShellView *shell_view, - Evolution_ShellView corba_object); +void evolution_shell_view_construct (EvolutionShellView *shell_view, + GNOME_Evolution_ShellView corba_object); EvolutionShellView *evolution_shell_view_new (void); #ifdef __cplusplus diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c index d841987ba7..7dd8b9ac88 100644 --- a/shell/evolution-storage-listener.c +++ b/shell/evolution-storage-listener.c @@ -37,7 +37,7 @@ static GtkObjectClass *parent_class = NULL; struct _EvolutionStorageListenerPrivate { - Evolution_StorageListener corba_objref; + GNOME_Evolution_StorageListener corba_objref; EvolutionStorageListenerServant *servant; }; @@ -54,7 +54,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* Evolution::StorageListener implementation. */ -static POA_Evolution_StorageListener__vepv my_Evolution_StorageListener_vepv; +static POA_GNOME_Evolution_StorageListener__vepv my_GNOME_Evolution_StorageListener_vepv; static EvolutionStorageListener * gtk_object_from_servant (PortableServer_Servant servant) @@ -66,7 +66,7 @@ gtk_object_from_servant (PortableServer_Servant servant) } static void -impl_Evolution_StorageListener_destroyed (PortableServer_Servant servant, +impl_GNOME_Evolution_StorageListener_notifyDestroyed (PortableServer_Servant servant, CORBA_Environment *ev) { EvolutionStorageListener *listener; @@ -79,9 +79,9 @@ impl_Evolution_StorageListener_destroyed (PortableServer_Servant servant, } static void -impl_Evolution_StorageListener_new_folder (PortableServer_Servant servant, +impl_GNOME_Evolution_StorageListener_notifyFolderCreated (PortableServer_Servant servant, const CORBA_char *path, - const Evolution_Folder *folder, + const GNOME_Evolution_Folder *folder, CORBA_Environment *ev) { EvolutionStorageListener *listener; @@ -94,7 +94,7 @@ impl_Evolution_StorageListener_new_folder (PortableServer_Servant servant, } static void -impl_Evolution_StorageListener_update_folder (PortableServer_Servant servant, +impl_GNOME_Evolution_StorageListener_notifyFolderUpdated (PortableServer_Servant servant, const CORBA_char *path, const CORBA_char *display_name, CORBA_boolean highlighted, @@ -111,7 +111,7 @@ impl_Evolution_StorageListener_update_folder (PortableServer_Servant servant, } static void -impl_Evolution_StorageListener_removed_folder (PortableServer_Servant servant, +impl_GNOME_Evolution_StorageListener_removed_folder (PortableServer_Servant servant, const CORBA_char *path, CORBA_Environment *ev) { @@ -128,16 +128,16 @@ static EvolutionStorageListenerServant * create_servant (EvolutionStorageListener *listener) { EvolutionStorageListenerServant *servant; - POA_Evolution_StorageListener *corba_servant; + POA_GNOME_Evolution_StorageListener *corba_servant; CORBA_Environment ev; CORBA_exception_init (&ev); servant = g_new0 (EvolutionStorageListenerServant, 1); - corba_servant = (POA_Evolution_StorageListener *) servant; + corba_servant = (POA_GNOME_Evolution_StorageListener *) servant; - corba_servant->vepv = &my_Evolution_StorageListener_vepv; - POA_Evolution_StorageListener__init ((PortableServer_Servant) corba_servant, &ev); + corba_servant->vepv = &my_GNOME_Evolution_StorageListener_vepv; + POA_GNOME_Evolution_StorageListener__init ((PortableServer_Servant) corba_servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -151,11 +151,11 @@ create_servant (EvolutionStorageListener *listener) return servant; } -static Evolution_StorageListener +static GNOME_Evolution_StorageListener activate_servant (EvolutionStorageListener *listener, - POA_Evolution_StorageListener *servant) + POA_GNOME_Evolution_StorageListener *servant) { - Evolution_StorageListener corba_object; + GNOME_Evolution_StorageListener corba_object; CORBA_Environment ev; CORBA_exception_init (&ev); @@ -199,7 +199,7 @@ impl_destroy (GtkObject *object) PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev); CORBA_free (object_id); - POA_Evolution_StorageListener__fini (priv->servant, &ev); + POA_GNOME_Evolution_StorageListener__fini (priv->servant, &ev); } CORBA_exception_free (&ev); @@ -213,8 +213,8 @@ impl_destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_StorageListener__vepv *vepv; - POA_Evolution_StorageListener__epv *epv; + POA_GNOME_Evolution_StorageListener__vepv *vepv; + POA_GNOME_Evolution_StorageListener__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -222,15 +222,15 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_StorageListener__epv, 1); - epv->destroyed = impl_Evolution_StorageListener_destroyed; - epv->new_folder = impl_Evolution_StorageListener_new_folder; - epv->update_folder = impl_Evolution_StorageListener_update_folder; - epv->removed_folder = impl_Evolution_StorageListener_removed_folder; + epv = g_new0 (POA_GNOME_Evolution_StorageListener__epv, 1); + epv->notifyDestroyed = impl_GNOME_Evolution_StorageListener_notifyDestroyed; + epv->notifyFolderCreated = impl_GNOME_Evolution_StorageListener_notifyFolderCreated; + epv->notifyFolderUpdated = impl_GNOME_Evolution_StorageListener_notifyFolderUpdated; + epv->notifyFolderRemoved = impl_GNOME_Evolution_StorageListener_removed_folder; - vepv = & my_Evolution_StorageListener_vepv; + vepv = & my_GNOME_Evolution_StorageListener_vepv; vepv->_base_epv = base_epv; - vepv->Evolution_StorageListener_epv = epv; + vepv->GNOME_Evolution_StorageListener_epv = epv; } static void @@ -296,7 +296,7 @@ init (EvolutionStorageListener *storage_listener) void evolution_storage_listener_construct (EvolutionStorageListener *listener, - Evolution_StorageListener corba_objref) + GNOME_Evolution_StorageListener corba_objref) { EvolutionStorageListenerPrivate *priv; @@ -317,13 +317,13 @@ evolution_storage_listener_new (void) { EvolutionStorageListener *new; EvolutionStorageListenerPrivate *priv; - Evolution_StorageListener corba_objref; + GNOME_Evolution_StorageListener corba_objref; new = gtk_type_new (evolution_storage_listener_get_type ()); priv = new->priv; priv->servant = create_servant (new); - corba_objref = activate_servant (new, (POA_Evolution_StorageListener *) priv->servant); + corba_objref = activate_servant (new, (POA_GNOME_Evolution_StorageListener *) priv->servant); evolution_storage_listener_construct (new, corba_objref); @@ -340,7 +340,7 @@ evolution_storage_listener_new (void) * * Return value: A pointer to the CORBA object reference. **/ -Evolution_StorageListener +GNOME_Evolution_StorageListener evolution_storage_listener_corba_objref (EvolutionStorageListener *listener) { EvolutionStorageListenerPrivate *priv; diff --git a/shell/evolution-storage-listener.h b/shell/evolution-storage-listener.h index 50a1ef7f72..bb3067621a 100644 --- a/shell/evolution-storage-listener.h +++ b/shell/evolution-storage-listener.h @@ -61,7 +61,7 @@ struct _EvolutionStorageListenerClass { void (* destroyed) (EvolutionStorageListener *storage_listener); void (* new_folder) (EvolutionStorageListener *storage_listener, const char *path, - const Evolution_Folder *folder); + const GNOME_Evolution_Folder *folder); void (* update_folder) (EvolutionStorageListener *storage_listener, const char *path, const char *display_name); @@ -71,7 +71,7 @@ struct _EvolutionStorageListenerClass { struct _EvolutionStorageListenerServant { - POA_Evolution_StorageListener servant_placeholder; + POA_GNOME_Evolution_StorageListener servant_placeholder; EvolutionStorageListener *gtk_object; }; typedef struct _EvolutionStorageListenerServant EvolutionStorageListenerServant; @@ -79,10 +79,10 @@ typedef struct _EvolutionStorageListenerServant EvolutionStorageListenerServant; GtkType evolution_storage_listener_get_type (void); void evolution_storage_listener_construct (EvolutionStorageListener *listener, - Evolution_StorageListener corba_objref); + GNOME_Evolution_StorageListener corba_objref); EvolutionStorageListener *evolution_storage_listener_new (void); -Evolution_StorageListener evolution_storage_listener_corba_objref (EvolutionStorageListener *listener); +GNOME_Evolution_StorageListener evolution_storage_listener_corba_objref (EvolutionStorageListener *listener); #ifdef __cplusplus } diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c index a6b6d89f8e..e7f73b5e0a 100644 --- a/shell/evolution-storage-set-view-listener.c +++ b/shell/evolution-storage-set-view-listener.c @@ -37,7 +37,7 @@ static GtkObjectClass *parent_class = NULL; struct _EvolutionStorageSetViewListenerPrivate { - Evolution_StorageSetViewListener corba_listener; + GNOME_Evolution_StorageSetViewListener corba_listener; EvolutionStorageSetViewListenerServant *servant; }; @@ -51,7 +51,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* Evolution::StorageSetViewListener implementation. */ -static POA_Evolution_StorageSetViewListener__vepv my_Evolution_StorageSetViewListener_vepv; +static POA_GNOME_Evolution_StorageSetViewListener__vepv my_GNOME_Evolution_StorageSetViewListener_vepv; static EvolutionStorageSetViewListener * gtk_object_from_servant (PortableServer_Servant servant) @@ -63,7 +63,7 @@ gtk_object_from_servant (PortableServer_Servant servant) } static void -impl_Evolution_StorageSetViewListener_folder_selected (PortableServer_Servant servant, +impl_GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (PortableServer_Servant servant, const CORBA_char *uri, CORBA_Environment *ev) { @@ -75,7 +75,7 @@ impl_Evolution_StorageSetViewListener_folder_selected (PortableServer_Servant se } static void -impl_Evolution_StorageSetViewListener_storage_selected (PortableServer_Servant servant, +impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected (PortableServer_Servant servant, const CORBA_char *uri, CORBA_Environment *ev) { @@ -90,16 +90,16 @@ static EvolutionStorageSetViewListenerServant * create_servant (EvolutionStorageSetViewListener *listener) { EvolutionStorageSetViewListenerServant *servant; - POA_Evolution_StorageSetViewListener *corba_servant; + POA_GNOME_Evolution_StorageSetViewListener *corba_servant; CORBA_Environment ev; CORBA_exception_init (&ev); servant = g_new0 (EvolutionStorageSetViewListenerServant, 1); - corba_servant = (POA_Evolution_StorageSetViewListener *) servant; + corba_servant = (POA_GNOME_Evolution_StorageSetViewListener *) servant; - corba_servant->vepv = &my_Evolution_StorageSetViewListener_vepv; - POA_Evolution_StorageSetViewListener__init ((PortableServer_Servant) corba_servant, &ev); + corba_servant->vepv = &my_GNOME_Evolution_StorageSetViewListener_vepv; + POA_GNOME_Evolution_StorageSetViewListener__init ((PortableServer_Servant) corba_servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -113,11 +113,11 @@ create_servant (EvolutionStorageSetViewListener *listener) return servant; } -static Evolution_StorageSetViewListener +static GNOME_Evolution_StorageSetViewListener activate_servant (EvolutionStorageSetViewListener *listener, - POA_Evolution_StorageSetViewListener *servant) + POA_GNOME_Evolution_StorageSetViewListener *servant) { - Evolution_StorageSetViewListener corba_object; + GNOME_Evolution_StorageSetViewListener corba_object; CORBA_Environment ev; CORBA_exception_init (&ev); @@ -159,7 +159,7 @@ impl_destroy (GtkObject *object) PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev); CORBA_free (object_id); - POA_Evolution_StorageSetViewListener__fini (priv->servant, &ev); + POA_GNOME_Evolution_StorageSetViewListener__fini (priv->servant, &ev); } CORBA_exception_free (&ev); @@ -174,8 +174,8 @@ impl_destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_StorageSetViewListener__vepv *vepv; - POA_Evolution_StorageSetViewListener__epv *epv; + POA_GNOME_Evolution_StorageSetViewListener__vepv *vepv; + POA_GNOME_Evolution_StorageSetViewListener__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -183,13 +183,13 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_StorageSetViewListener__epv, 1); - epv->folder_selected = impl_Evolution_StorageSetViewListener_folder_selected; - epv->storage_selected = impl_Evolution_StorageSetViewListener_storage_selected; + epv = g_new0 (POA_GNOME_Evolution_StorageSetViewListener__epv, 1); + epv->notifyFolderSelected = impl_GNOME_Evolution_StorageSetViewListener_notifyFolderSelected; + epv->notifyStorageSelected = impl_GNOME_Evolution_StorageSetViewListener_notifyStorageSelected; - vepv = & my_Evolution_StorageSetViewListener_vepv; + vepv = & my_GNOME_Evolution_StorageSetViewListener_vepv; vepv->_base_epv = base_epv; - vepv->Evolution_StorageSetViewListener_epv = epv; + vepv->GNOME_Evolution_StorageSetViewListener_epv = epv; } static void @@ -237,7 +237,7 @@ init (EvolutionStorageSetViewListener *storage_set_view_listener) void evolution_storage_set_view_listener_construct (EvolutionStorageSetViewListener *listener, - Evolution_StorageSetViewListener corba_listener) + GNOME_Evolution_StorageSetViewListener corba_listener) { EvolutionStorageSetViewListenerPrivate *priv; @@ -259,20 +259,20 @@ evolution_storage_set_view_listener_new (void) { EvolutionStorageSetViewListener *new; EvolutionStorageSetViewListenerPrivate *priv; - Evolution_StorageSetViewListener corba_listener; + GNOME_Evolution_StorageSetViewListener corba_listener; new = gtk_type_new (evolution_storage_set_view_listener_get_type ()); priv = new->priv; priv->servant = create_servant (new); - corba_listener = activate_servant (new, (POA_Evolution_StorageSetViewListener *) priv->servant); + corba_listener = activate_servant (new, (POA_GNOME_Evolution_StorageSetViewListener *) priv->servant); evolution_storage_set_view_listener_construct (new, corba_listener); return new; } -Evolution_StorageSetViewListener +GNOME_Evolution_StorageSetViewListener evolution_storage_set_view_listener_corba_objref (EvolutionStorageSetViewListener *listener) { EvolutionStorageSetViewListenerPrivate *priv; diff --git a/shell/evolution-storage-set-view-listener.h b/shell/evolution-storage-set-view-listener.h index 662acc8f4c..334072a55e 100644 --- a/shell/evolution-storage-set-view-listener.h +++ b/shell/evolution-storage-set-view-listener.h @@ -61,7 +61,7 @@ struct _EvolutionStorageSetViewListenerClass { struct _EvolutionStorageSetViewListenerServant { - POA_Evolution_StorageSetViewListener servant_placeholder; + POA_GNOME_Evolution_StorageSetViewListener servant_placeholder; EvolutionStorageSetViewListener *gtk_object; }; typedef struct _EvolutionStorageSetViewListenerServant EvolutionStorageSetViewListenerServant; @@ -69,10 +69,10 @@ typedef struct _EvolutionStorageSetViewListenerServant EvolutionStorageSetViewLi GtkType evolution_storage_set_view_listener_get_type (void); void evolution_storage_set_view_listener_construct (EvolutionStorageSetViewListener *listener, - Evolution_StorageSetViewListener corba_objref); + GNOME_Evolution_StorageSetViewListener corba_objref); EvolutionStorageSetViewListener *evolution_storage_set_view_listener_new (void); -Evolution_StorageSetViewListener evolution_storage_set_view_listener_corba_objref (EvolutionStorageSetViewListener *listener); +GNOME_Evolution_StorageSetViewListener evolution_storage_set_view_listener_corba_objref (EvolutionStorageSetViewListener *listener); #ifdef __cplusplus } diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c index 70892c686d..1fcac0bc01 100644 --- a/shell/evolution-storage-set-view.c +++ b/shell/evolution-storage-set-view.c @@ -54,12 +54,12 @@ storage_set_view_widget_folder_selected_cb (EStorageSetView *storage_set_view_wi for (p = priv->listeners; p != NULL; p = p->next) { CORBA_Environment ev; - Evolution_StorageSetViewListener listener; + GNOME_Evolution_StorageSetViewListener listener; CORBA_exception_init (&ev); - listener = (Evolution_StorageSetViewListener) p->data; - Evolution_StorageSetViewListener_folder_selected (listener, uri, &ev); + listener = (GNOME_Evolution_StorageSetViewListener) p->data; + GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, uri, &ev); /* FIXME: What if we fail? */ @@ -81,12 +81,12 @@ storage_set_view_widget_storage_selected_cb (EStorageSetView *storage_set_view_w for (p = priv->listeners; p != NULL; p = p->next) { CORBA_Environment ev; - Evolution_StorageSetViewListener listener; + GNOME_Evolution_StorageSetViewListener listener; CORBA_exception_init (&ev); - listener = (Evolution_StorageSetViewListener) p->data; - Evolution_StorageSetViewListener_storage_selected (listener, uri, &ev); + listener = (GNOME_Evolution_StorageSetViewListener) p->data; + GNOME_Evolution_StorageSetViewListener_notifyStorageSelected (listener, uri, &ev); /* FIXME: What if we fail? */ @@ -98,7 +98,7 @@ storage_set_view_widget_storage_selected_cb (EStorageSetView *storage_set_view_w /* Listener handling. */ static GList * -find_listener_in_list (Evolution_StorageSetViewListener listener, +find_listener_in_list (GNOME_Evolution_StorageSetViewListener listener, GList *list) { CORBA_Environment ev; @@ -107,9 +107,9 @@ find_listener_in_list (Evolution_StorageSetViewListener listener, CORBA_exception_init (&ev); for (p = list; p != NULL; p = p->next) { - Evolution_StorageSetViewListener listener_item; + GNOME_Evolution_StorageSetViewListener listener_item; - listener_item = (Evolution_StorageSetViewListener) p->data; + listener_item = (GNOME_Evolution_StorageSetViewListener) p->data; if (CORBA_Object_is_equivalent (listener, listener_item, &ev)) break; } @@ -121,12 +121,12 @@ find_listener_in_list (Evolution_StorageSetViewListener listener, static gboolean add_listener (EvolutionStorageSetView *storage_set_view, - Evolution_StorageSetViewListener listener) + GNOME_Evolution_StorageSetViewListener listener) { EvolutionStorageSetViewPrivate *priv; CORBA_Environment ev; const char *current_uri; - Evolution_StorageSetViewListener copy_of_listener; + GNOME_Evolution_StorageSetViewListener copy_of_listener; priv = storage_set_view->priv; @@ -145,7 +145,7 @@ add_listener (EvolutionStorageSetView *storage_set_view, current_uri = e_storage_set_view_get_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view_widget)); if (current_uri != NULL) - Evolution_StorageSetViewListener_folder_selected (listener, current_uri, &ev); + GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (listener, current_uri, &ev); CORBA_exception_free (&ev); @@ -154,7 +154,7 @@ add_listener (EvolutionStorageSetView *storage_set_view, static gboolean remove_listener (EvolutionStorageSetView *storage_set_view, - Evolution_StorageSetViewListener listener) + GNOME_Evolution_StorageSetViewListener listener) { EvolutionStorageSetViewPrivate *priv; GList *listener_node; @@ -178,20 +178,20 @@ remove_listener (EvolutionStorageSetView *storage_set_view, /* CORBA interface implementation. */ -static POA_Evolution_StorageSetView__vepv StorageSetView_vepv; +static POA_GNOME_Evolution_StorageSetView__vepv StorageSetView_vepv; -static POA_Evolution_StorageSetView * +static POA_GNOME_Evolution_StorageSetView * create_servant (void) { - POA_Evolution_StorageSetView *servant; + POA_GNOME_Evolution_StorageSetView *servant; CORBA_Environment ev; CORBA_exception_init (&ev); - servant = (POA_Evolution_StorageSetView *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_StorageSetView *) g_new0 (BonoboObjectServant, 1); servant->vepv = &StorageSetView_vepv; - POA_Evolution_StorageSetView__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_StorageSetView__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); servant = NULL; @@ -204,7 +204,7 @@ create_servant (void) static void impl_StorageSetView_add_listener (PortableServer_Servant servant, - const Evolution_StorageSetViewListener listener, + const GNOME_Evolution_StorageSetViewListener listener, CORBA_Environment *ev) { BonoboObject *bonobo_object; @@ -215,12 +215,12 @@ impl_StorageSetView_add_listener (PortableServer_Servant servant, if (! add_listener (storage_set_view, listener)) CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_StorageSetView_AlreadyListening, NULL); + ex_GNOME_Evolution_StorageSetView_AlreadyListening, NULL); } static void impl_StorageSetView_remove_listener (PortableServer_Servant servant, - const Evolution_StorageSetViewListener listener, + const GNOME_Evolution_StorageSetViewListener listener, CORBA_Environment *ev) { BonoboObject *bonobo_object; @@ -231,7 +231,7 @@ impl_StorageSetView_remove_listener (PortableServer_Servant servant, if (! remove_listener (storage_set_view, listener)) CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_StorageSetView_NotFound, NULL); + ex_GNOME_Evolution_StorageSetView_NotFound, NULL); } static CORBA_boolean @@ -285,9 +285,9 @@ impl_destroy (GtkObject *object) CORBA_exception_init (&ev); for (p = priv->listeners; p != NULL; p = p->next) { - Evolution_StorageSetViewListener listener; + GNOME_Evolution_StorageSetViewListener listener; - listener = (Evolution_StorageSetViewListener) p->data; + listener = (GNOME_Evolution_StorageSetViewListener) p->data; CORBA_Object_release (listener, &ev); } @@ -303,8 +303,8 @@ impl_destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_StorageSetView__vepv *vepv; - POA_Evolution_StorageSetView__epv *epv; + POA_GNOME_Evolution_StorageSetView__vepv *vepv; + POA_GNOME_Evolution_StorageSetView__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -312,16 +312,16 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_StorageSetView__epv, 1); - epv->add_listener = impl_StorageSetView_add_listener; - epv->remove_listener = impl_StorageSetView_remove_listener; - epv->_set_show_folders = impl_StorageSetView__set_show_folders; - epv->_get_show_folders = impl_StorageSetView__get_show_folders; + epv = g_new0 (POA_GNOME_Evolution_StorageSetView__epv, 1); + epv->addListener = impl_StorageSetView_add_listener; + epv->removeListener = impl_StorageSetView_remove_listener; + epv->_set_showFolders = impl_StorageSetView__set_show_folders; + epv->_get_showFolders = impl_StorageSetView__get_show_folders; vepv = &StorageSetView_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_StorageSetView_epv = epv; + vepv->GNOME_Evolution_StorageSetView_epv = epv; } static void @@ -352,7 +352,7 @@ init (EvolutionStorageSetView *storage_set_view) void evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view, - Evolution_StorageSetView corba_object, + GNOME_Evolution_StorageSetView corba_object, EStorageSetView *storage_set_view_widget) { EvolutionStorageSetViewPrivate *priv; @@ -379,8 +379,8 @@ evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view, EvolutionStorageSetView * evolution_storage_set_view_new (EStorageSetView *storage_set_view_widget) { - POA_Evolution_StorageSetView *servant; - Evolution_StorageSetView corba_object; + POA_GNOME_Evolution_StorageSetView *servant; + GNOME_Evolution_StorageSetView corba_object; EvolutionStorageSetView *new; g_return_val_if_fail (storage_set_view_widget != NULL, NULL); diff --git a/shell/evolution-storage-set-view.h b/shell/evolution-storage-set-view.h index 1f3a9f84bf..36f7c99f63 100644 --- a/shell/evolution-storage-set-view.h +++ b/shell/evolution-storage-set-view.h @@ -59,7 +59,7 @@ struct _EvolutionStorageSetViewClass { GtkType evolution_storage_set_view_get_type (void); void evolution_storage_set_view_construct (EvolutionStorageSetView *storage_set_view, - Evolution_StorageSetView corba_object, + GNOME_Evolution_StorageSetView corba_object, EStorageSetView *storage_set_view_widget); EvolutionStorageSetView *evolution_storage_set_view_new (EStorageSetView *storage_set_view_widget); diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index f9127c56c0..6f67a71471 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -56,25 +56,25 @@ list_through_listener_foreach (EFolderTree *tree, void *data, void *closure) { - const Evolution_Folder *corba_folder; - Evolution_StorageListener corba_listener; + const GNOME_Evolution_Folder *corba_folder; + GNOME_Evolution_StorageListener corba_listener; CORBA_Environment ev; - corba_folder = (Evolution_Folder *) data; - corba_listener = (Evolution_StorageListener) closure; + corba_folder = (GNOME_Evolution_Folder *) data; + corba_listener = (GNOME_Evolution_StorageListener) closure; /* The root folder has no data. */ if (corba_folder == NULL) return; CORBA_exception_init (&ev); - Evolution_StorageListener_new_folder (corba_listener, path, corba_folder, &ev); + GNOME_Evolution_StorageListener_notifyFolderCreated (corba_listener, path, corba_folder, &ev); CORBA_exception_free (&ev); } static void list_through_listener (EvolutionStorage *storage, - Evolution_StorageListener listener, + GNOME_Evolution_StorageListener listener, CORBA_Environment *ev) { EvolutionStoragePrivate *priv; @@ -87,7 +87,7 @@ list_through_listener (EvolutionStorage *storage, } static GList * -find_listener_in_list (const Evolution_StorageListener listener, +find_listener_in_list (const GNOME_Evolution_StorageListener listener, GList *list) { CORBA_Environment ev; @@ -96,9 +96,9 @@ find_listener_in_list (const Evolution_StorageListener listener, CORBA_exception_init (&ev); for (p = list; p != NULL; p = p->next) { - Evolution_StorageListener listener_item; + GNOME_Evolution_StorageListener listener_item; - listener_item = (Evolution_StorageListener) p->data; + listener_item = (GNOME_Evolution_StorageListener) p->data; if (CORBA_Object_is_equivalent (listener_item, listener, &ev) && ev._major == CORBA_NO_EXCEPTION) return p; @@ -111,10 +111,10 @@ find_listener_in_list (const Evolution_StorageListener listener, static gboolean add_listener (EvolutionStorage *storage, - const Evolution_StorageListener listener) + const GNOME_Evolution_StorageListener listener) { EvolutionStoragePrivate *priv; - Evolution_StorageListener listener_copy; + GNOME_Evolution_StorageListener listener_copy; CORBA_Environment ev; priv = storage->priv; @@ -147,7 +147,7 @@ add_listener (EvolutionStorage *storage, static gboolean remove_listener (EvolutionStorage *storage, - const Evolution_StorageListener listener) + const GNOME_Evolution_StorageListener listener) { EvolutionStoragePrivate *priv; CORBA_Environment ev; @@ -177,29 +177,29 @@ folder_destroy_notify (EFolderTree *tree, void *data, void *closure) { - Evolution_Folder *corba_folder; + GNOME_Evolution_Folder *corba_folder; - corba_folder = (Evolution_Folder *) data; + corba_folder = (GNOME_Evolution_Folder *) data; CORBA_free (data); } /* CORBA interface implementation. */ -static POA_Evolution_Storage__vepv Storage_vepv; +static POA_GNOME_Evolution_Storage__vepv Storage_vepv; -static POA_Evolution_Storage * +static POA_GNOME_Evolution_Storage * create_servant (void) { - POA_Evolution_Storage *servant; + POA_GNOME_Evolution_Storage *servant; CORBA_Environment ev; - servant = (POA_Evolution_Storage *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Storage *) g_new0 (BonoboObjectServant, 1); servant->vepv = &Storage_vepv; CORBA_exception_init (&ev); - POA_Evolution_Storage__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Storage__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -228,7 +228,7 @@ impl_Storage__get_name (PortableServer_Servant servant, static void impl_Storage_add_listener (PortableServer_Servant servant, - const Evolution_StorageListener listener, + const GNOME_Evolution_StorageListener listener, CORBA_Environment *ev) { BonoboObject *bonobo_object; @@ -238,12 +238,12 @@ impl_Storage_add_listener (PortableServer_Servant servant, storage = EVOLUTION_STORAGE (bonobo_object); if (! add_listener (storage, listener)) - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Evolution_Storage_AlreadyListening, NULL); + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Storage_AlreadyListening, NULL); } static void impl_Storage_remove_listener (PortableServer_Servant servant, - const Evolution_StorageListener listener, + const GNOME_Evolution_StorageListener listener, CORBA_Environment *ev) { BonoboObject *bonobo_object; @@ -253,7 +253,7 @@ impl_Storage_remove_listener (PortableServer_Servant servant, storage = EVOLUTION_STORAGE (bonobo_object); if (! remove_listener (storage, listener)) - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Evolution_Storage_NotFound, NULL); + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Storage_NotFound, NULL); } @@ -278,11 +278,11 @@ destroy (GtkObject *object) CORBA_exception_init (&ev); for (p = priv->corba_storage_listeners; p != NULL; p = p->next) { - Evolution_StorageListener listener; + GNOME_Evolution_StorageListener listener; listener = p->data; - Evolution_StorageListener_destroyed (listener, &ev); + GNOME_Evolution_StorageListener_notifyDestroyed (listener, &ev); /* (This is not a Bonobo object, so no unref.) */ CORBA_Object_release (listener, &ev); @@ -301,7 +301,7 @@ destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_Storage__vepv *vepv; + POA_GNOME_Evolution_Storage__vepv *vepv; PortableServer_ServantBase__epv *base_epv; @@ -312,7 +312,7 @@ corba_class_init (void) vepv = &Storage_vepv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_Storage_epv = evolution_storage_get_epv (); + vepv->GNOME_Evolution_Storage_epv = evolution_storage_get_epv (); } static void @@ -342,22 +342,22 @@ init (EvolutionStorage *storage) } -POA_Evolution_Storage__epv * +POA_GNOME_Evolution_Storage__epv * evolution_storage_get_epv (void) { - POA_Evolution_Storage__epv *epv; + POA_GNOME_Evolution_Storage__epv *epv; - epv = g_new0 (POA_Evolution_Storage__epv, 1); - epv->_get_name = impl_Storage__get_name; - epv->add_listener = impl_Storage_add_listener; - epv->remove_listener = impl_Storage_remove_listener; + epv = g_new0 (POA_GNOME_Evolution_Storage__epv, 1); + epv->_get_name = impl_Storage__get_name; + epv->addListener = impl_Storage_add_listener; + epv->removeListener = impl_Storage_remove_listener; return epv; } void evolution_storage_construct (EvolutionStorage *storage, - Evolution_Storage corba_object, + GNOME_Evolution_Storage corba_object, const char *name) { EvolutionStoragePrivate *priv; @@ -378,8 +378,8 @@ EvolutionStorage * evolution_storage_new (const char *name) { EvolutionStorage *new; - POA_Evolution_Storage *servant; - Evolution_Storage corba_object; + POA_GNOME_Evolution_Storage *servant; + GNOME_Evolution_Storage corba_object; g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (name[0] != '\0', NULL); @@ -398,11 +398,11 @@ evolution_storage_new (const char *name) EvolutionStorageResult evolution_storage_register (EvolutionStorage *evolution_storage, - Evolution_StorageRegistry corba_storage_registry) + GNOME_Evolution_StorageRegistry corba_storage_registry) { EvolutionStorageResult result; - Evolution_StorageListener corba_storage_listener; - Evolution_Storage corba_storage; + GNOME_Evolution_StorageListener corba_storage_listener; + GNOME_Evolution_Storage corba_storage; EvolutionStoragePrivate *priv; CORBA_Environment ev; @@ -421,7 +421,7 @@ evolution_storage_register (EvolutionStorage *evolution_storage, CORBA_exception_init (&ev); corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (evolution_storage)); - corba_storage_listener = Evolution_StorageRegistry_register_storage (corba_storage_registry, + corba_storage_listener = GNOME_Evolution_StorageRegistry_addStorage (corba_storage_registry, corba_storage, priv->name, &ev); @@ -431,7 +431,7 @@ evolution_storage_register (EvolutionStorage *evolution_storage, } else { if (ev._major != CORBA_USER_EXCEPTION) result = EVOLUTION_STORAGE_ERROR_CORBA; - else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageRegistry_Exists) == 0) + else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageRegistry_Exists) == 0) result = EVOLUTION_STORAGE_ERROR_EXISTS; else result = EVOLUTION_STORAGE_ERROR_GENERIC; @@ -444,9 +444,9 @@ evolution_storage_register (EvolutionStorage *evolution_storage, EvolutionStorageResult evolution_storage_register_on_shell (EvolutionStorage *evolution_storage, - Evolution_Shell corba_shell) + GNOME_Evolution_Shell corba_shell) { - Evolution_StorageRegistry corba_storage_registry; + GNOME_Evolution_StorageRegistry corba_storage_registry; EvolutionStorageResult result; CORBA_Environment ev; @@ -486,9 +486,9 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage, const char *description, gboolean highlighted) { - EvolutionStorageResult result; + EvolutionStorageResult result; EvolutionStoragePrivate *priv; - Evolution_Folder *corba_folder; + GNOME_Evolution_Folder *corba_folder; CORBA_Environment ev; GList *p; @@ -508,7 +508,7 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage, CORBA_exception_init (&ev); - corba_folder = Evolution_Folder__alloc (); + corba_folder = GNOME_Evolution_Folder__alloc (); corba_folder->display_name = CORBA_string_dup (display_name); corba_folder->description = CORBA_string_dup (description); corba_folder->type = CORBA_string_dup (type); @@ -518,17 +518,17 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage, result = EVOLUTION_STORAGE_OK; for (p = priv->corba_storage_listeners; p != NULL; p = p->next) { - Evolution_StorageListener listener; + GNOME_Evolution_StorageListener listener; listener = p->data; - Evolution_StorageListener_new_folder (listener, path, corba_folder, &ev); + GNOME_Evolution_StorageListener_notifyFolderCreated (listener, path, corba_folder, &ev); if (ev._major == CORBA_NO_EXCEPTION) continue; if (ev._major != CORBA_USER_EXCEPTION) result = EVOLUTION_STORAGE_ERROR_CORBA; - else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageListener_Exists) == 0) + else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_Exists) == 0) result = EVOLUTION_STORAGE_ERROR_EXISTS; else result = EVOLUTION_STORAGE_ERROR_GENERIC; @@ -555,7 +555,7 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage, EvolutionStoragePrivate *priv; CORBA_Environment ev; GList *p; - Evolution_Folder *corba_folder; + GNOME_Evolution_Folder *corba_folder; g_return_val_if_fail (evolution_storage != NULL, EVOLUTION_STORAGE_ERROR_INVALIDPARAMETER); @@ -574,17 +574,17 @@ evolution_storage_update_folder (EvolutionStorage *evolution_storage, result = EVOLUTION_STORAGE_OK; for (p = priv->corba_storage_listeners; p != NULL; p = p->next) { - Evolution_StorageListener listener; + GNOME_Evolution_StorageListener listener; listener = p->data; - Evolution_StorageListener_update_folder (listener, path, display_name, highlighted, &ev); + GNOME_Evolution_StorageListener_notifyFolderUpdated (listener, path, display_name, highlighted, &ev); if (ev._major != CORBA_NO_EXCEPTION) continue; if (ev._major != CORBA_USER_EXCEPTION) result = EVOLUTION_STORAGE_ERROR_CORBA; - else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageListener_NotFound) == 0) + else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_NotFound) == 0) result = EVOLUTION_STORAGE_ERROR_NOTFOUND; else result = EVOLUTION_STORAGE_ERROR_GENERIC; @@ -633,17 +633,17 @@ evolution_storage_removed_folder (EvolutionStorage *evolution_storage, result = EVOLUTION_STORAGE_OK; for (p = priv->corba_storage_listeners; p != NULL; p = p->next) { - Evolution_StorageListener listener; + GNOME_Evolution_StorageListener listener; listener = p->data; - Evolution_StorageListener_removed_folder (listener, path, &ev); + GNOME_Evolution_StorageListener_notifyFolderRemoved (listener, path, &ev); if (ev._major != CORBA_NO_EXCEPTION) continue; if (ev._major != CORBA_USER_EXCEPTION) result = EVOLUTION_STORAGE_ERROR_CORBA; - else if (strcmp (CORBA_exception_id (&ev), ex_Evolution_StorageListener_NotFound) == 0) + else if (strcmp (CORBA_exception_id (&ev), ex_GNOME_Evolution_StorageListener_NotFound) == 0) result = EVOLUTION_STORAGE_ERROR_NOTFOUND; else result = EVOLUTION_STORAGE_ERROR_GENERIC; diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h index 91b34c4efe..b59dea931c 100644 --- a/shell/evolution-storage.h +++ b/shell/evolution-storage.h @@ -72,18 +72,18 @@ struct _EvolutionStorageClass { }; -POA_Evolution_Storage__epv *evolution_storage_get_epv (void); +POA_GNOME_Evolution_Storage__epv *evolution_storage_get_epv (void); GtkType evolution_storage_get_type (void); void evolution_storage_construct (EvolutionStorage *storage, - Evolution_Storage corba_object, + GNOME_Evolution_Storage corba_object, const char *name); EvolutionStorage *evolution_storage_new (const char *name); EvolutionStorageResult evolution_storage_register (EvolutionStorage *storage, - Evolution_StorageRegistry corba_registry); + GNOME_Evolution_StorageRegistry corba_registry); EvolutionStorageResult evolution_storage_register_on_shell (EvolutionStorage *evolution_storage, - Evolution_Shell corba_shell); + GNOME_Evolution_Shell corba_shell); EvolutionStorageResult evolution_storage_new_folder (EvolutionStorage *evolution_storage, const char *path, const char *display_name, |