aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog24
-rw-r--r--shell/e-corba-storage.c1
-rw-r--r--shell/e-shell-offline-handler.c2
-rw-r--r--shell/e-shell-offline-sync.c2
-rw-r--r--shell/evolution-shell-component-client.c3
-rw-r--r--shell/evolution-storage-listener.c2
-rw-r--r--shell/evolution-storage-set-view-listener.c2
7 files changed, 25 insertions, 11 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 89f67988a5..ac19b76ac1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,29 @@
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.
(no_views_left_cb): Use g_object_add_weak_pointer() instad of
connecting to the "destroy" signal.
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index dd50d168ea..8f09c2846c 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -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;
diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c
index b38701ceeb..030f2ff3f8 100644
--- a/shell/e-shell-offline-handler.c
+++ b/shell/e-shell-offline-handler.c
@@ -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);
diff --git a/shell/e-shell-offline-sync.c b/shell/e-shell-offline-sync.c
index b47638bf4a..67e33fd99b 100644
--- a/shell/e-shell-offline-sync.c
+++ b/shell/e-shell-offline-sync.c
@@ -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);
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index 769b3a2e5d..b076753ded 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-client.c
@@ -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);
}
diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c
index 68dc9addac..e33d0bd735 100644
--- a/shell/evolution-storage-listener.c
+++ b/shell/evolution-storage-listener.c
@@ -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);
diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c
index e7a3a85556..82e4f4f671 100644
--- a/shell/evolution-storage-set-view-listener.c
+++ b/shell/evolution-storage-set-view-listener.c
@@ -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);