aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-06-09 02:51:04 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-06-09 02:51:04 +0800
commit63f6e70ecc65e1b2bb174c5376bd4f98ac474d5e (patch)
tree2f6aa2d07f792cd1093845d4255bc8081fedb2a0
parent04aed95972de36157dc05b849b7433448458d0bc (diff)
downloadgsoc2013-evolution-63f6e70ecc65e1b2bb174c5376bd4f98ac474d5e.tar.gz
gsoc2013-evolution-63f6e70ecc65e1b2bb174c5376bd4f98ac474d5e.tar.zst
gsoc2013-evolution-63f6e70ecc65e1b2bb174c5376bd4f98ac474d5e.zip
Allow a NULL @shell_view arg in
`e_shell_command_add_to_shortcut_bar()'. svn path=/trunk/; revision=10160
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-folder-commands.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 20682ec34b..327d172ee6 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-08 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
+ Allow a NULL @shell_view arg.
+
2001-06-08 Jason Leach <jleach@ximian.com>
* e-shell.c (e_shell_construct): Fix splash setup to keep it from
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index dee3e88674..6b0a1b0fe8 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -333,8 +333,7 @@ e_shell_command_add_to_shortcut_bar (EShell *shell,
g_return_if_fail (shell != NULL);
g_return_if_fail (E_IS_SHELL (shell));
- g_return_if_fail (shell_view != NULL);
- g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
+ g_return_if_fail (shell_view != NULL && ! E_IS_SHELL_VIEW (shell_view));
shortcuts = e_shell_get_shortcuts (shell);
group_num = e_shell_view_get_current_shortcuts_group_num (shell_view);
s-gnome/commit/net-p2p/tribler?h=gstreamer0.10-removal&id=530706893f31269bbfa303e069f2e76cbbe2fce7'>- update png to 1.5.10dinoex2012-06-011-0/+1 * - Update to 5.5.24miwi2012-04-223-9/+126