aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/main.c9
-rw-r--r--shell/shell-errors.xml22
3 files changed, 33 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 9a08ff1114..dcaae8add6 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-18 Not Zed <NotZed@Ximian.com>
+
+ * shell-errors.xml: added noshell and noshell-reason error
+ strings. the latter seems a waste, but ...
+
+ * main.c (idle_cb): use e_error for the new no shell errors.
+
2004-05-17 Jeffrey Stedfast <fejj@novell.com>
* e-shell-window-commands.c: Change E_PIXMAP() sizes over to
diff --git a/shell/main.c b/shell/main.c
index 3b67aa7098..600842710b 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -68,6 +68,7 @@
#include "Evolution-DataServer.h"
#include <gal/widgets/e-cursors.h>
+#include "widgets/misc/e-error.h"
#include <fcntl.h>
#include <signal.h>
@@ -387,8 +388,7 @@ idle_cb (void *data)
case E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER:
corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) {
- e_notice (NULL, GTK_MESSAGE_ERROR,
- _("Cannot register the Evolution shell."));
+ e_error_run(NULL, "shell:noshell", NULL);
CORBA_exception_free (&ev);
bonobo_main_quit ();
return FALSE;
@@ -396,9 +396,8 @@ idle_cb (void *data)
break;
default:
- e_notice (NULL, GTK_MESSAGE_ERROR,
- _("Cannot initialize the Evolution shell: %s"),
- e_shell_construct_result_to_string (result));
+ e_error_run(NULL, "shell:noshell-reason",
+ e_shell_construct_result_to_string(result), NULL);
CORBA_exception_free (&ev);
bonobo_main_quit ();
return FALSE;
diff --git a/shell/shell-errors.xml b/shell/shell-errors.xml
index 676b4d0133..023cdd581c 100644
--- a/shell/shell-errors.xml
+++ b/shell/shell-errors.xml
@@ -20,4 +20,26 @@ If you choose to continue, you may not have access to some of your old data.
<button stock="gtk-ok" label="Continue" response="GTK_RESPONSE_OK"/>
</error>
+ <error id="noshell" type="error">
+ <title>Cannot start Evolution</title>
+ <primary>Evolution can not start.</primary>
+ <secondary>Your system configuration does not match your Evolution configuration.
+
+Click help for details</secondary>
+ <help uri="http://support.ximian.com/q?54"/>
+ <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
+ </error>
+
+ <error id="noshell-reason" type="error">
+ <title>Cannot start Evolution</title>
+ <primary>Evolution can not start.</primary>
+ <secondary>Your system configuration does not match your Evolution configuration:
+
+{0}
+
+Click help for details.</secondary>
+ <help uri="http://support.ximian.com/q?54"/>
+ <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
+ </error>
+
</error-list>