aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-signature-editor.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 79eaeaa200..77c1b6476b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-01 Not Zed <NotZed@Ximian.com>
+
+ * mail-signature-editor.c (load_signature): ugh, unlike camel
+ exceptions, you can't pass NULL to CORBA calls.
+ (mail_signature_editor): ditto. See bug #58815.
+
2004-05-28 Jeffrey Stedfast <fejj@novell.com>
* em-folder-tree.c (d): Disable debug here too - all this code has
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index 4828a46aa0..f1e2985785 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -278,9 +278,9 @@ load_signature (ESignatureEditor *editor)
if (editor->html) {
Bonobo_PersistFile pfile_iface;
- pfile_iface = Bonobo_Unknown_queryInterface (bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)),
- "IDL:Bonobo/PersistFile:1.0", NULL);
CORBA_exception_init (&ev);
+ pfile_iface = Bonobo_Unknown_queryInterface (bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)),
+ "IDL:Bonobo/PersistFile:1.0", &ev);
Bonobo_PersistFile_load (pfile_iface, editor->sig->filename, &ev);
CORBA_exception_free (&ev);
} else {
@@ -292,10 +292,10 @@ load_signature (ESignatureEditor *editor)
html = g_strdup_printf ("<PRE>\n%s", data);
g_free (data);
+ CORBA_exception_init (&ev);
pstream_iface = Bonobo_Unknown_queryInterface
(bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)),
- "IDL:Bonobo/PersistStream:1.0", NULL);
- CORBA_exception_init (&ev);
+ "IDL:Bonobo/PersistStream:1.0",&ev);
stream = bonobo_stream_mem_create (html, strlen (html), TRUE, FALSE);
if (stream == NULL) {
@@ -395,8 +395,8 @@ mail_signature_editor (ESignature *sig, GtkWindow *parent, gboolean is_new)
}
editor->engine = (GNOME_GtkHTML_Editor_Engine) Bonobo_Unknown_queryInterface
- (bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", NULL);
-
+ (bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
+ CORBA_exception_free(&ev);
load_signature (editor);
bonobo_ui_component_set_prop (component, "/commands/FormatHtml", "state", editor->html ? "1" : "0", NULL);