aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-06 04:20:35 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-06 04:20:35 +0800
commit12db8c46874e98b39ad026972527e422e4c228eb (patch)
tree1df578f1b8673f30163dfd5a3e26ed7c55038a0c /shell
parent5082cc09d7a9efb41617e206d90d6c2807040ce9 (diff)
downloadgsoc2013-evolution-12db8c46874e98b39ad026972527e422e4c228eb.tar
gsoc2013-evolution-12db8c46874e98b39ad026972527e422e4c228eb.tar.gz
gsoc2013-evolution-12db8c46874e98b39ad026972527e422e4c228eb.tar.bz2
gsoc2013-evolution-12db8c46874e98b39ad026972527e422e4c228eb.tar.lz
gsoc2013-evolution-12db8c46874e98b39ad026972527e422e4c228eb.tar.xz
gsoc2013-evolution-12db8c46874e98b39ad026972527e422e4c228eb.tar.zst
gsoc2013-evolution-12db8c46874e98b39ad026972527e422e4c228eb.zip
(e_shell_show_settings): Allow type being NULL.
svn path=/trunk/; revision=18561
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/e-shell.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 601a89d4af..4318d8edfa 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,9 @@
2002-11-05 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell.c (e_shell_show_settings): Allow type being NULL.
+
+2002-11-05 Ettore Perazzoli <ettore@ximian.com>
+
* e-local-storage.c (load_folder): Do add folders with an unknown
type.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ef9eee8b6e..3d15ce0f74 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -2098,7 +2098,6 @@ e_shell_show_settings (EShell *shell, const char *type, EShellView *shell_view)
g_return_if_fail (shell != NULL);
g_return_if_fail (E_IS_SHELL (shell));
- g_return_if_fail (type != NULL);
priv = shell->priv;
@@ -2109,7 +2108,9 @@ e_shell_show_settings (EShell *shell, const char *type, EShellView *shell_view)
}
priv->settings_dialog = e_shell_settings_dialog_new ();
- e_shell_settings_dialog_show_type (E_SHELL_SETTINGS_DIALOG (priv->settings_dialog), type);
+
+ if (type != NULL)
+ e_shell_settings_dialog_show_type (E_SHELL_SETTINGS_DIALOG (priv->settings_dialog), type);
g_signal_connect (priv->settings_dialog, "destroy",
G_CALLBACK (settings_dialog_destroy_cb), shell);