diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-09-09 01:37:57 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-09-09 01:37:57 +0800 |
| commit | 2be069f2fad9e5973fae2c543defb09c7375ccc3 (patch) | |
| tree | 8c202a160827f05c04cb115371f60adb52f1e43c | |
| parent | f2df2bcabee527ff9e8aae3f88b102b0c810f04f (diff) | |
| download | gsoc2013-evolution-2be069f2fad9e5973fae2c543defb09c7375ccc3.tar.gz gsoc2013-evolution-2be069f2fad9e5973fae2c543defb09c7375ccc3.tar.zst gsoc2013-evolution-2be069f2fad9e5973fae2c543defb09c7375ccc3.zip | |
Fix Chris' fixes.
svn path=/trunk/; revision=5270
| -rw-r--r-- | shell/ChangeLog | 10 | ||||
| -rw-r--r-- | shell/evolution-storage-listener.c | 6 | ||||
| -rw-r--r-- | shell/evolution-storage.c | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 86352d5825..7441bf61cc 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2000-09-08 Ettore Perazzoli <ettore@helixcode.com> + + * evolution-storage-listener.c (create_servant): Return an + `EvolutionStorageListenerServant' instead of a + `POA_Evolution_StorageListener'. + (evolution_storage_listener_new): Add a cast accordingly. + + * evolution-storage.c (corba_class_init): Remove `NO_WARNINGS' + madness. + 2000-09-08 Christopher James Lahey <clahey@helixcode.com> * e-storage-set-view.c: Added base ETableModel functions. diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c index ee45e442ea..79afb04032 100644 --- a/shell/evolution-storage-listener.c +++ b/shell/evolution-storage-listener.c @@ -106,7 +106,7 @@ impl_Evolution_StorageListener_removed_folder (PortableServer_Servant servant, gtk_signal_emit (GTK_OBJECT (listener), signals[REMOVED_FOLDER], path); } -static POA_Evolution_StorageListener * +static EvolutionStorageListenerServant * create_servant (EvolutionStorageListener *listener) { EvolutionStorageListenerServant *servant; @@ -130,7 +130,7 @@ create_servant (EvolutionStorageListener *listener) CORBA_exception_free (&ev); - return (POA_Evolution_StorageListener *) servant; + return servant; } static Evolution_StorageListener @@ -292,7 +292,7 @@ evolution_storage_listener_new (void) priv = new->priv; priv->servant = create_servant (new); - corba_objref = activate_servant (new, priv->servant); + corba_objref = activate_servant (new, (POA_Evolution_StorageListener *) priv->servant); evolution_storage_listener_construct (new, corba_objref); diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 9912b5bb2a..887a9f98d5 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -158,9 +158,7 @@ static void corba_class_init (void) { POA_Evolution_Storage__vepv *vepv; -#ifndef NO_WARNINGS - POA_Evolution_Storage__epv *epv; -#endif + PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); |