aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-12-04 04:08:14 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-12-04 04:08:14 +0800
commit9407166101cd70d7920e1122eb96617b6028ea38 (patch)
tree384466b3c878b251b14ba88abf71c7a3ab85767b /shell
parentda19e7a409b666b83895376bf4fe5b4f8d052f86 (diff)
downloadgsoc2013-evolution-9407166101cd70d7920e1122eb96617b6028ea38.tar
gsoc2013-evolution-9407166101cd70d7920e1122eb96617b6028ea38.tar.gz
gsoc2013-evolution-9407166101cd70d7920e1122eb96617b6028ea38.tar.bz2
gsoc2013-evolution-9407166101cd70d7920e1122eb96617b6028ea38.tar.lz
gsoc2013-evolution-9407166101cd70d7920e1122eb96617b6028ea38.tar.xz
gsoc2013-evolution-9407166101cd70d7920e1122eb96617b6028ea38.tar.zst
gsoc2013-evolution-9407166101cd70d7920e1122eb96617b6028ea38.zip
If component_id is the empty string, pass NULL for it to
* e-shell.c (impl_Shell_createNewWindow): If component_id is the empty string, pass NULL for it to e_shell_create_window() so we get the default. * main.c (idle_cb): Pass an empty string for component_id to createNewWindow() if the default_component_id is NULL. svn path=/trunk/; revision=23620
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog13
-rw-r--r--shell/e-shell.c3
-rw-r--r--shell/main.c5
3 files changed, 19 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b3c4b4ae00..2637f005cc 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,6 +1,17 @@
2003-12-03 Ettore Perazzoli <ettore@ximian.com>
- * Makefile.am: move e-task-bar and e-task-widget into libeshell.
+ [Fix for #51619.]
+
+ * e-shell.c (impl_Shell_createNewWindow): If component_id is the
+ empty string, pass NULL for it to e_shell_create_window() so we
+ get the default.
+
+ * main.c (idle_cb): Pass an empty string for component_id to
+ createNewWindow() if the default_component_id is NULL.
+
+2003-12-03 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Move e-task-bar and e-task-widget into libeshell.
[Fix pointed out by Bernard Leach <leachbj@bouncycastle.org>.]
2003-12-03 Ettore Perazzoli <ettore@ximian.com>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index a29461ef00..e5e7281361 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -185,6 +185,9 @@ impl_Shell_createNewWindow (PortableServer_Servant servant,
bonobo_object = bonobo_object_from_servant (servant);
shell = E_SHELL (bonobo_object);
+ if (component_id[0] == '\0')
+ component_id = NULL;
+
shell_window = e_shell_create_window (shell, component_id, NULL);
if (shell_window == NULL) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
diff --git a/shell/main.c b/shell/main.c
index dfc4a17643..2807600f68 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -436,7 +436,10 @@ idle_cb (void *data)
CORBA_Environment ev;
CORBA_exception_init (&ev);
- GNOME_Evolution_Shell_createNewWindow (corba_shell, default_component_id, &ev);
+ if (default_component_id == NULL)
+ GNOME_Evolution_Shell_createNewWindow (corba_shell, "", &ev);
+ else
+ GNOME_Evolution_Shell_createNewWindow (corba_shell, default_component_id, &ev);
CORBA_exception_free (&ev);
}