diff options
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-shell.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index c51e3e0f56..b30d67ab25 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2000-07-10 Dan Winship <danw@helixcode.com> + + * e-shell.c (impl_Shell_user_select_folder): Translate a + default_folder of "" into NULL (which can't be passed over CORBA). + 2000-07-10 Ettore Perazzoli <ettore@helixcode.com> * e-storage.c (e_storage_new_folder): Removed debugging message. diff --git a/shell/e-shell.c b/shell/e-shell.c index 8a262b4a8a..cd73795ee5 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -237,6 +237,9 @@ impl_Shell_user_select_folder (PortableServer_Servant servant, allowed_types[i] = corba_allowed_types->_buffer[i]; allowed_types[corba_allowed_types->_length] = NULL; + /* CORBA doesn't allow you to pass a NULL pointer. */ + if (!*default_folder) + default_folder = NULL; folder_selection_dialog = e_shell_folder_selection_dialog_new (shell, title, default_folder, allowed_types); listener_duplicate = CORBA_Object_duplicate (listener, ev); |