From 2a9973b6fb45980836115bdbb0a05f0478d0a08e Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 1 Jul 2001 11:43:52 +0000 Subject: Fix a crash that happened when dragging a folder that didn't have a component associated with it. svn path=/trunk/; revision=10656 --- shell/ChangeLog | 6 ++++++ shell/e-storage-set-view.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index 98a719d656..396a50fa72 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2001-07-01 Ettore Perazzoli + + * e-storage-set-view.c (tree_drag_begin): If the node doesn't have + a component, just don't start the whole CORBA drag thing instead + of crashing with an assertion. + 2001-07-01 Ettore Perazzoli * e-shell-view-menu.c (command_new_shortcut): New, implementation diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 5b5e117c1b..fc4872f9b1 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -902,7 +902,8 @@ tree_drag_begin (ETree *etree, folder = get_folder_at_node (storage_set_view, path); component_client = get_component_at_node (storage_set_view, path); - g_assert (component_client != NULL); + if (component_client == NULL) + return; /* Query the `ShellComponentDnd::SourceFolder' interface on the component. */ -- cgit v1.2.3