diff options
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-shell-offline-handler.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 3a5bd55c91..7da94af9e2 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2004-02-18 Not Zed <NotZed@Ximian.com> + + * e-shell-offline-handler.c (prepare_for_offline): remove id, and + use info->id for create_progress_listener. Fixes #53649. + 2004-02-10 JP Rosevear <jpr@ximian.com> * Remove dead files diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c index 008af4dd93..3a0b9f8d40 100644 --- a/shell/e-shell-offline-handler.c +++ b/shell/e-shell-offline-handler.c @@ -420,16 +420,15 @@ prepare_for_offline (EShellOfflineHandler *offline_handler) OfflineProgressListenerServant *progress_listener_servant; ComponentInfo *component_info; CORBA_Environment ev; - const char *id; offline_interface = get_offline_interface (info->iface); if (offline_interface == CORBA_OBJECT_NIL) continue; - if (! create_progress_listener (offline_handler, id, + if (! create_progress_listener (offline_handler, info->id, &progress_listener_interface, &progress_listener_servant)) { - g_warning ("Cannot create the Evolution::OfflineProgressListener interface for `%s'", id); + g_warning ("Cannot create the Evolution::OfflineProgressListener interface for `%s'", info->id); continue; } @@ -438,7 +437,7 @@ prepare_for_offline (EShellOfflineHandler *offline_handler) GNOME_Evolution_Offline_prepareForOffline (offline_interface, &active_connection_list, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Cannot prepare component component to go offline -- %s [%s]", - id, BONOBO_EX_REPOID (&ev)); + info->id, BONOBO_EX_REPOID (&ev)); progress_listener_servant_free (progress_listener_servant); @@ -454,7 +453,7 @@ prepare_for_offline (EShellOfflineHandler *offline_handler) priv->num_total_connections += active_connection_list->_length; - component_info = component_info_new (id, + component_info = component_info_new (info->id, offline_interface, progress_listener_interface, progress_listener_servant, |