aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-user-creatable-items-handler.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 578ced0859..3d02a4bac6 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23 Joe Marcus Clarke <marcus@freebsd.org>
+
+ * e-user-creatable-items-handler.c: adding a check to make sure
+ the shortcut key is not the NUL byte. Fixes bug 327468.
+
2006-01-21 Andre Klapper <a9016009@gmx.de>
* e-shell-settings-dialog.c: changed string "Settings" to
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index 57779383dc..159c5b47b0 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -646,7 +646,7 @@ gtk_menu_item_func (EUserCreatableItemsHandler *handler, gpointer menu,
handler->priv->accel_group,
'n', GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- } else {
+ } else if (item->shortcut != '\0') {
gtk_widget_add_accelerator (menuitem, "activate",
handler->priv->accel_group,
item->shortcut,