aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-23 17:54:14 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-23 17:54:14 +0800
commit2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5 (patch)
tree763538caba28b1e38a444774df473fa83875f134 /shell
parent0e0dc0b15d17fe2d0c210a3829dc2eccffc4a5c9 (diff)
downloadgsoc2013-evolution-2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5.tar
gsoc2013-evolution-2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5.tar.gz
gsoc2013-evolution-2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5.tar.bz2
gsoc2013-evolution-2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5.tar.lz
gsoc2013-evolution-2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5.tar.xz
gsoc2013-evolution-2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5.tar.zst
gsoc2013-evolution-2b1f8f84f2d00797d0e12ba6ca4c7a230c3598a5.zip
** Fix for bug #334821 by Tollef Fog Heen
svn path=/trunk/; revision=32642
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/main.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d881699f43..35d24cac6d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-23 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #334821 by Tollef Fog Heen
+
+ * main.c: it should not spawn the default shell for uris.
+
2006-08-23 Daniel Gryniewicz <dang@gentoo.org>
* e-shell-window.c:
diff --git a/shell/main.c b/shell/main.c
index f5f3d13240..e2f10bb846 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -377,7 +377,8 @@ idle_cb (void *data)
}
if (shell != NULL) {
- e_shell_create_window (shell, default_component_id, NULL);
+ if (g_slist_length (uri_list) == 0)
+ e_shell_create_window (shell, default_component_id, NULL);
open_uris (corba_shell, uri_list);
} else {
CORBA_Environment ev;