aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-view-menu.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 9b58a3fb7b..90b86cf29c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-01 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-shell-view-menu.c (command_new_folder): Do a NULL-check on
+ current_uri - socket is being closed? (as per the comments for the
+ NULL-check in e-shell-view.c:socket_destroy_cb).
+
2001-07-31 Ettore Perazzoli <ettore@ximian.com>
* evolution-activity-client.c: Removed debugging messages.
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 21b8680c49..9e19ac310f 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -301,16 +301,16 @@ command_new_folder (BonoboUIComponent *uih,
EShell *shell;
const char *current_uri;
const char *default_parent_folder;
-
+
shell_view = E_SHELL_VIEW (data);
shell = e_shell_view_get_shell (shell_view);
current_uri = e_shell_view_get_current_uri (shell_view);
-
- if (strncmp (current_uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0)
+
+ if (current_uri && strncmp (current_uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0)
default_parent_folder = current_uri + E_SHELL_URI_PREFIX_LEN;
else
default_parent_folder = NULL;
-
+
e_shell_show_folder_creation_dialog (shell, GTK_WINDOW (shell_view),
default_parent_folder,
NULL /* result_callback */,