aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-02-22 10:30:47 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-02-22 10:30:47 +0800
commit92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7 (patch)
treec0f15a238c2f15ee9937d92e77fda4df75e26c67
parent91010cb2663638eb11b03193d14097ad1bc02d17 (diff)
downloadgsoc2013-evolution-92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7.tar
gsoc2013-evolution-92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7.tar.gz
gsoc2013-evolution-92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7.tar.bz2
gsoc2013-evolution-92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7.tar.lz
gsoc2013-evolution-92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7.tar.xz
gsoc2013-evolution-92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7.tar.zst
gsoc2013-evolution-92735b41ff62f11bf9f6f69f8dc9bc6cba7611c7.zip
Return NULL if there is no component ID for the current view.
* e-shell-user-creatable-items-handler.c (get_default_action_for_view): Return NULL if there is no component ID for the current view. svn path=/trunk/; revision=15792
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-user-creatable-items-handler.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 500a31dea3..42bc370b7c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2002-02-21 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-user-creatable-items-handler.c
+ (get_default_action_for_view): Return NULL if there is no
+ component ID for the current view.
+
+2002-02-21 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-user-creatable-items-handler.c (ensure_menu_items): Set
the icons for all the "New..." menu items from the specified one
in the type definitions.
diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c
index 8ce99341ec..1aa57ebcef 100644
--- a/shell/e-shell-user-creatable-items-handler.c
+++ b/shell/e-shell-user-creatable-items-handler.c
@@ -280,6 +280,8 @@ get_default_action_for_view (EShellUserCreatableItemsHandler *handler,
little more complex. Also, this is a pretty brutal and ugly hack. */
view_component_id = e_shell_view_get_current_component_id (shell_view);
+ if (view_component_id == NULL)
+ return NULL;
for (p = priv->components, component_num = 0; p != NULL; p = p->next, component_num ++) {
const Component *component;