diff options
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-shell-folder-selection-dialog.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index d0cc559e2f..408b6cfc87 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,12 @@ 2000-09-11 Ettore Perazzoli <ettore@helixcode.com> + * e-shell-folder-selection-dialog.c (set_default_folder): Work on + the assumption that @default_uri is not NULL. + (e_shell_folder_selection_dialog_construct): Only call if the + @default_uri is not NULL. + +2000-09-11 Ettore Perazzoli <ettore@helixcode.com> + * e-local-storage.c (new_folder): Removed debugging message. 2000-09-11 Ettore Perazzoli <ettore@helixcode.com> diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c index 3bf60d28e4..76801def2b 100644 --- a/shell/e-shell-folder-selection-dialog.c +++ b/shell/e-shell-folder-selection-dialog.c @@ -217,9 +217,11 @@ set_default_folder (EShellFolderSelectionDialog *shell_folder_selection_dialog, EShellFolderSelectionDialogPrivate *priv; char *default_path; + g_assert (default_uri != NULL); + priv = shell_folder_selection_dialog->priv; - if (default_uri && strncmp (default_uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0) { + if (strncmp (default_uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0) { /* `evolution:' URI. */ default_path = g_strdup (default_uri + E_SHELL_URI_PREFIX_LEN); } else { @@ -294,7 +296,8 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s g_strdup (allowed_types[i])); } - set_default_folder (folder_selection_dialog, default_uri); + if (default_uri != NULL) + set_default_folder (folder_selection_dialog, default_uri); scroll_frame = e_scroll_frame_new (NULL, NULL); e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame), |