callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid freeing the servant for now, it looks like something is messed up

Browse Source 
* evolution-shell-component-client.c (destroy_listener_interface):
Avoid freeing the servant for now, it looks like something is
messed up and this causes a crash on exit.

* evolution-storage-set-view-listener.c (impl_finalize): Do not
invoke POA_GNOME_Evolution_StorageSetViewListener__fini().

* evolution-storage-listener.c (impl_finalize): Do not invoke
POA_GNOME_Evolution_StorageListener__fini().

* e-shell-offline-sync.c (progress_listener_servant_free): Do not
invoke POA_GNOME_Evolution_SyncFolderProgressListener__fini().

* e-shell-offline-handler.c (progress_listener_servant_free): Do
not invoke POA_GNOME_Evolution_OfflineProgressListener__fini().

* e-corba-storage.c (impl_dispose): Do not invoke
POA_GNOME_Evolution_StorageListener__fini().

* evolution-shell-component-client.c (destroy_listener_interface):
Do not invoke POA_GNOME_Evolution_ShellComponentListener__fini().

svn path=/trunk/; revision=18759
This commit is contained in:
Ettore Perazzoli
2002-11-14 20:48:58 +00:00
parent 60daa6d24b
commit 7a6310d118
7 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
shell/ChangeLog
View File

@ -1,3 +1,27 @@
2002-11-14 Ettore Perazzoli <ettore@ximian.com>
* evolution-shell-component-client.c (destroy_listener_interface):
Avoid freeing the servant for now, it looks like something is
messed up and this causes a crash on exit.
* evolution-storage-set-view-listener.c (impl_finalize): Do not
invoke POA_GNOME_Evolution_StorageSetViewListener__fini().
* evolution-storage-listener.c (impl_finalize): Do not invoke
POA_GNOME_Evolution_StorageListener__fini().
* e-shell-offline-sync.c (progress_listener_servant_free): Do not
invoke POA_GNOME_Evolution_SyncFolderProgressListener__fini().
* e-shell-offline-handler.c (progress_listener_servant_free): Do
not invoke POA_GNOME_Evolution_OfflineProgressListener__fini().
* e-corba-storage.c (impl_dispose): Do not invoke
POA_GNOME_Evolution_StorageListener__fini().
* evolution-shell-component-client.c (destroy_listener_interface):
Do not invoke POA_GNOME_Evolution_ShellComponentListener__fini().
2002-11-14 Ettore Perazzoli <ettore@ximian.com>
* main.c (quit_box_destroyed_callback): Removed.

1
shell/e-corba-storage.c
View File

@ -268,7 +268,6 @@ impl_dispose (GObject *object)
&ev);
PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
POA_GNOME_Evolution_StorageListener__fini (priv->storage_listener_servant, &ev);
CORBA_free (object_id);
priv->storage_listener_servant = NULL;

2
shell/e-shell-offline-handler.c
View File

@ -146,8 +146,6 @@ progress_listener_servant_free (OfflineProgressListenerServant *servant)
PortableServer_POA_deactivate_object (bonobo_poa (), oid, &ev);
CORBA_free (oid);
POA_GNOME_Evolution_OfflineProgressListener__fini ((POA_GNOME_Evolution_OfflineProgressListener *) servant, &ev);
CORBA_exception_free (&ev);
g_free (servant->component_id);

2
shell/e-shell-offline-sync.c
View File

@ -114,8 +114,6 @@ progress_listener_servant_free (SyncFolderProgressListenerServant *servant)
PortableServer_POA_deactivate_object (bonobo_poa (), oid, &ev);
CORBA_free (oid);
POA_GNOME_Evolution_SyncFolderProgressListener__fini ((POA_GNOME_Evolution_SyncFolderProgressListener *) servant, &ev);
CORBA_exception_free (&ev);
g_free (servant);

3
shell/evolution-shell-component-client.c
View File

@ -253,11 +253,10 @@ destroy_listener_interface (EvolutionShellComponentClient *client)
oid = PortableServer_POA_servant_to_id (bonobo_poa (), priv->listener_servant, &ev);
PortableServer_POA_deactivate_object (bonobo_poa (), oid, &ev);
POA_GNOME_Evolution_ShellComponentListener__fini (priv->listener_servant, &ev);
CORBA_free (oid);
CORBA_Object_release (priv->listener_interface, &ev);
free_ShellComponentListener_servant (priv->listener_servant);
/* free_ShellComponentListener_servant (priv->listener_servant); */
CORBA_exception_free (&ev);
}

2
shell/evolution-storage-listener.c
View File

@ -210,8 +210,6 @@ impl_finalize (GObject *object)
object_id = PortableServer_POA_servant_to_id (bonobo_poa(), priv->servant, &ev);
PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
CORBA_free (object_id);
POA_GNOME_Evolution_StorageListener__fini (priv->servant, &ev);
}
CORBA_exception_free (&ev);

2
shell/evolution-storage-set-view-listener.c
View File

@ -157,8 +157,6 @@ impl_finalize (GObject *object)
object_id = PortableServer_POA_servant_to_id (bonobo_poa(), priv->servant, &ev);
PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
CORBA_free (object_id);
POA_GNOME_Evolution_StorageSetViewListener__fini (priv->servant, &ev);
}
CORBA_exception_free (&ev);