aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-07-01 19:43:52 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-07-01 19:43:52 +0800
commit2a9973b6fb45980836115bdbb0a05f0478d0a08e (patch)
tree703d6b0be77df929834d16d107788ad69f419042
parent2990822b331d03ae98a2dbbc5fe07622aba5f005 (diff)
downloadgsoc2013-evolution-2a9973b6fb45980836115bdbb0a05f0478d0a08e.tar.gz
gsoc2013-evolution-2a9973b6fb45980836115bdbb0a05f0478d0a08e.tar.zst
gsoc2013-evolution-2a9973b6fb45980836115bdbb0a05f0478d0a08e.zip
Fix a crash that happened when dragging a folder that didn't have a
component associated with it. svn path=/trunk/; revision=10656
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-storage-set-view.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 98a719d656..396a50fa72 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2001-07-01 Ettore Perazzoli <ettore@ximian.com>
+ * 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 <ettore@ximian.com>
+
* e-shell-view-menu.c (command_new_shortcut): New, implementation
for the "New Shortcut" command create a new shortcut.
(goto_folder_dialog_cancelled_cb): Renamed from
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. */