diff options
| author | Parthasarathi Susarla <saps@src.gnome.org> | 2005-12-21 15:18:49 +0800 |
|---|---|---|
| committer | Parthasarathi Susarla <saps@src.gnome.org> | 2005-12-21 15:18:49 +0800 |
| commit | 57884e830b43bf7a4a1eb08ce59cb8dd06a0de60 (patch) | |
| tree | 8924656fe29b0ca86450ed4c55c185d917f2770b /shell/e-shell.c | |
| parent | 8e71ebe0f4885419bb524fed4838a3277003a828 (diff) | |
| download | gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar.gz gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar.zst gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.zip | |
committed these files to fix http://bugzilla.gnome.org/show_bug.cgi?id=260354
ChangeLog addressbook/ChangeLog
addressbook/gui/component/addressbook-component.c
calendar/ChangeLog calendar/gui/calendar-component.c
calendar/gui/memos-component.c calendar/gui/tasks-component.c
mail/ChangeLog mail/Evolution-Mail.idl mail/mail-component.c
shell/ChangeLog shell/Evolution-Component.idl
shell/Evolution-Shell.idl shell/Evolution.idl
shell/Makefile.am shell/e-shell-window.c
shell/e-shell-window.h shell/e-shell.c
svn path=/trunk/; revision=30915
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 99277b1cf6..433baa9ccf 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -67,6 +67,7 @@ #include "e-shell-marshal.h" #include "e-shell-settings-dialog.h" #include "e-shell.h" +#include "e-shell-view.h" #include "es-event.h" #include "evolution-listener.h" #include "evolution-shell-component-utils.h" @@ -216,7 +217,7 @@ raise_exception_if_not_ready (PortableServer_Servant servant, return FALSE; } -static void +static GNOME_Evolution_ShellView impl_Shell_createNewWindow (PortableServer_Servant servant, const CORBA_char *component_id, CORBA_Environment *ev) @@ -224,9 +225,10 @@ impl_Shell_createNewWindow (PortableServer_Servant servant, BonoboObject *bonobo_object; EShell *shell; EShellWindow *shell_window; + EShellView *shell_view; if (raise_exception_if_not_ready (servant, ev)) - return; + return CORBA_OBJECT_NIL; bonobo_object = bonobo_object_from_servant (servant); shell = E_SHELL (bonobo_object); @@ -238,8 +240,14 @@ impl_Shell_createNewWindow (PortableServer_Servant servant, if (shell_window == NULL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL); - return; + return CORBA_OBJECT_NIL; } + + /* refs?? */ + shell_view = e_shell_view_new(shell_window); + + return BONOBO_OBJREF(shell_view); + } static void |