[Fix #6232, the thirty-four-splash-screens-at-startup bug.]
* e-shell.c (setup_local_storage): Add an E_STORAGE() cast to prevent a warning. * main.c (idle_cb): Only try to activate from the shell ID if the result is `E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER'; if there is a different error, spit out a dialog box with a description of it and exit instead. * e-shell.c (e_shell_construct): Return an `EShellConstructResult' describing what kind of result we had. Show the splash after the DB has been reached, not before. (e_shell_construct_result_to_string): New function to get a descriptive string out of an `EShellConstructResult'. (e_shell_new): New arg @construct_result_return to return a description of the result of the operation. * e-shell.h: New enum `EShellConstructResult'. * e-shell.c (impl_Shell_createNewView): Raise `InternalError' instead of crashing if the shell_view returns a CORBA_OBJECT_NIL. * Evolution-Shell.idl: New exception `InternalError'. `createNewView' and `handleURI' can raise it. svn path=/trunk/; revision=11611
This commit is contained in:
@ -20,6 +20,7 @@ module Evolution {
|
||||
exception NotFound {};
|
||||
exception UnsupportedSchema {};
|
||||
exception InvalidURI {};
|
||||
exception InternalError {};
|
||||
exception Busy {};
|
||||
|
||||
typedef sequence<string> FolderTypeNameList;
|
||||
@ -43,7 +44,7 @@ module Evolution {
|
||||
* Return value: the new view.
|
||||
*/
|
||||
ShellView createNewView (in string uri)
|
||||
raises (NotFound, UnsupportedSchema, InvalidURI);
|
||||
raises (NotFound, UnsupportedSchema, InvalidURI, InternalError);
|
||||
|
||||
/**
|
||||
* handleURI:
|
||||
@ -55,7 +56,7 @@ module Evolution {
|
||||
* the message composer.)
|
||||
*/
|
||||
void handleURI (in string uri)
|
||||
raises (NotFound, UnsupportedSchema, InvalidURI);
|
||||
raises (NotFound, UnsupportedSchema, InvalidURI, InternalError);
|
||||
|
||||
/**
|
||||
* selectUserFolder:
|
||||
|
||||
Reference in New Issue
Block a user