callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some annoying warnings in the folder selection dialog.

Browse Source 
svn path=/trunk/; revision=5339
This commit is contained in:
Ettore Perazzoli
2000-09-11 18:55:59 +00:00
parent 8600d3c205
commit ae6deca3ec
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/ChangeLog
View File

@ -1,3 +1,10 @@
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> 2000-09-11 Ettore Perazzoli <ettore@helixcode.com>
* e-local-storage.c (new_folder): Removed debugging message. * e-local-storage.c (new_folder): Removed debugging message.

5
shell/e-shell-folder-selection-dialog.c
View File

@ -217,9 +217,11 @@ set_default_folder (EShellFolderSelectionDialog *shell_folder_selection_dialog,
EShellFolderSelectionDialogPrivate *priv; EShellFolderSelectionDialogPrivate *priv;
char *default_path; char *default_path;
g_assert (default_uri != NULL);
priv = shell_folder_selection_dialog->priv; 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. */ /* `evolution:' URI. */
default_path = g_strdup (default_uri + E_SHELL_URI_PREFIX_LEN); default_path = g_strdup (default_uri + E_SHELL_URI_PREFIX_LEN);
} else { } else {
@ -294,6 +296,7 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
g_strdup (allowed_types[i])); g_strdup (allowed_types[i]));
} }
if (default_uri != NULL)
set_default_folder (folder_selection_dialog, default_uri); set_default_folder (folder_selection_dialog, default_uri);
scroll_frame = e_scroll_frame_new (NULL, NULL); scroll_frame = e_scroll_frame_new (NULL, NULL);