From dacf8177a931cfd4914a2eb0499dcb6aa0d2a9ea Mon Sep 17 00:00:00 2001 From: Gediminas Paulauskas Date: Tue, 3 Apr 2001 01:00:56 +0000 Subject: Iain's fix did not help, fixing myself. closes #1914 svn path=/trunk/; revision=9112 --- shell/ChangeLog | 5 +++++ shell/importer/evolution-importer-client.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index 0b5c3836e1..a402bb638b 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2001-04-03 Gediminas Paulauskas + + * importer/evolution-importer-client.c (evolution_importer_client_load_file): + fix Iain's fix which did nothing. closes #1914. + 2001-03-31 Christopher James Lahey * evolution-storage-set-view.c: Include here. diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 00ec8208b9..0921dd8773 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -174,7 +174,6 @@ evolution_importer_client_load_file (EvolutionImporterClient *client, const char *folderpath) { GNOME_Evolution_Importer corba_importer; - CORBA_char *folderpath_dup; gboolean result; CORBA_Environment ev; @@ -184,9 +183,10 @@ evolution_importer_client_load_file (EvolutionImporterClient *client, CORBA_exception_init (&ev); corba_importer = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - folderpath_dup = CORBA_string_dup (folderpath ? folderpath : ""); result = GNOME_Evolution_Importer_loadFile (corba_importer, - filename, folderpath, &ev); + filename, + folderpath ? folderpath : "", + &ev); CORBA_exception_free (&ev); return result; -- cgit v1.2.3