Use e_error_run() instead of the e_activation_error_dialog() stuff that no

2004-06-04  Jeffrey Stedfast  <fejj@novell.com>

	* e-msg-composer.c (create_composer): Use e_error_run() instead of
	the e_activation_error_dialog() stuff that no longer exists.

svn path=/trunk/; revision=26215

4 files changed, 31 insertions, 18 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 8bc814a397..b31569bfa4 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-04  Jeffrey Stedfast  <fejj@novell.com>
+
+	* e-msg-composer.c (create_composer): Use e_error_run() instead of
+	the e_activation_error_dialog() stuff that no longer exists.
+
 2004-06-03  Radek Doulik  <rodo@ximian.com>
 
 	* e-msg-composer.c (e_msg_composer_show_sig_file): always insert
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index fb03c9782a..5b1d60bd46 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -158,7 +158,7 @@ static GtkTargetEntry drop_types[] = {
 
 static int num_drop_types = sizeof (drop_types) / sizeof (drop_types[0]);
 
-static const char * emc_draft_format_names[] = { "pgp-sign", "pgp-encrypt", "smime-sign", "smime-encrypt" };
+static const char *emc_draft_format_names[] = { "pgp-sign", "pgp-encrypt", "smime-sign", "smime-encrypt" };
 
 
 /* The parent class.  */
@@ -3143,11 +3143,7 @@ create_composer (int visible_mask)
 	vis = e_msg_composer_get_visible_flags (composer);
 	composer->hdrs = e_msg_composer_hdrs_new (composer->uic, visible_mask, vis);
 	if (!composer->hdrs) {
-		e_activation_failure_dialog (GTK_WINDOW (composer),
-					     _("Could not create composer window:\n"
-					       "Unable to activate address selector control."),
-					     SELECT_NAMES_OAFIID,
-					     "IDL:Bonobo/Control:1.0");
+		e_error_run (GTK_WINDOW (composer), "mail-composer:no-address-control", NULL);
 		gtk_object_destroy (GTK_OBJECT (composer));
 		return NULL;
 	}
@@ -3171,13 +3167,7 @@ create_composer (int visible_mask)
 		GNOME_GTKHTML_EDITOR_CONTROL_ID,
 		bonobo_ui_component_get_container (composer->uic));
 	if (!composer->editor) {
-		e_activation_failure_dialog (GTK_WINDOW (composer),
-					     _("Could not create composer window:\n"
-					       "Unable to activate HTML editor component.\n"
-					       "Please make sure you have the correct version\n"
-					       "of gtkhtml and libgtkhtml installed.\n"),
-					     GNOME_GTKHTML_EDITOR_CONTROL_ID,
-					     "IDL:Bonobo/Control:1.0");
+		e_error_run (GTK_WINDOW (composer), "mail-composer:no-editor-control", NULL);
 		gtk_object_destroy (GTK_OBJECT (composer));
 		return NULL;
 	}
@@ -3275,11 +3265,7 @@ create_composer (int visible_mask)
 	e_msg_composer_show_attachments (composer, FALSE);
 	prepare_engine (composer);
 	if (composer->editor_engine == CORBA_OBJECT_NIL) {
-		e_activation_failure_dialog (GTK_WINDOW (composer),
-					     _("Could not create composer window:\n"
-					       "Unable to activate HTML editor component."),
-					     GNOME_GTKHTML_EDITOR_CONTROL_ID,
-					     "IDL:GNOME/GtkHTML/Editor/Engine:1.0");
+		e_error_run (GTK_WINDOW (composer), "mail-composer:no-editor-control", NULL);
 		gtk_object_destroy (GTK_OBJECT (composer));
 		return NULL;
 	}
diff --git a/composer/mail-composer-errors.xml b/composer/mail-composer-errors.xml
index ff332c622a..cf4258c6d5 100644
--- a/composer/mail-composer-errors.xml
+++ b/composer/mail-composer-errors.xml
@@ -52,4 +52,16 @@
   <secondary>You need to configure an account before you can compose mail.</secondary>
  </error>
 
+ <error id="no-address-control" type="error" modal="true">
+  <primary>Could not create composer window.</primary>
+  <secondary>Unable to activate the address selector control.</secondary>
+ </error>
+
+ <error id="no-editor-control" type="error" modal="true">
+  <primary>Could not create composer window.</primary>
+  <secondary>Unable to activate the HTML editor control.
+
+Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.</secondary>
+ </error>
+
 </error-list>
diff --git a/composer/mail-composer-errors.xml.h b/composer/mail-composer-errors.xml.h
index 8527e3e72f..d7682e7259 100644
--- a/composer/mail-composer-errors.xml.h
+++ b/composer/mail-composer-errors.xml.h
@@ -40,3 +40,13 @@ char *s = N_("Because \"{1}\".");
 char *s = N_("All accounts have been removed.");
 /* mail-composer:all-accounts-deleted secondary */
 char *s = N_("You need to configure an account before you can compose mail.");
+/* mail-composer:no-address-control primary */
+char *s = N_("Could not create composer window.");
+/* mail-composer:no-address-control secondary */
+char *s = N_("Unable to activate the address selector control.");
+/* mail-composer:no-editor-control primary */
+char *s = N_("Could not create composer window.");
+/* mail-composer:no-editor-control secondary */
+char *s = N_("Unable to activate the HTML editor control.\n"
+	"\n"
+	"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.");