aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-corba-shortcuts.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 16788744c1..1ec415f65d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-13 Peter Williams <peterw@ximian.com>
+
+ * e-corba-shortcuts.c (shortcut_list_to_corba): Don't cause an abort
+ if the shortcut group is empty.
+
2001-08-13 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (IDLS): Add `Evolution-common.idl'.
diff --git a/shell/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c
index 5a834cb6c6..54181d803c 100644
--- a/shell/e-corba-shortcuts.c
+++ b/shell/e-corba-shortcuts.c
@@ -80,7 +80,8 @@ shortcut_list_to_corba (const GSList *shortcut_list,
buffer[i].type = CORBA_string_dup (e_safe_corba_string (item->type));
}
- CORBA_sequence_set_release (buffer, TRUE);
+ if (buffer) /* if we have 0 shortcuts, buffer = NULL */
+ CORBA_sequence_set_release (buffer, TRUE);
}