diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-05-26 22:36:45 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-05-26 22:36:45 +0800 |
| commit | 8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0 (patch) | |
| tree | 9047ddcbffeab70f0ab257b876c65e2364e6c8ee | |
| parent | 5de3176b65b94b487e4cd11686c3f473a0966f6c (diff) | |
| download | gsoc2013-evolution-8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0.tar gsoc2013-evolution-8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0.tar.gz gsoc2013-evolution-8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0.tar.bz2 gsoc2013-evolution-8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0.tar.lz gsoc2013-evolution-8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0.tar.xz gsoc2013-evolution-8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0.tar.zst gsoc2013-evolution-8ad057518fc70b8eb1ac7eaabb01a7950e3f63c0.zip | |
Update for PersistStream changes
* mail-format.c (handle_via_bonobo): Update for PersistStream
changes
svn path=/trunk/; revision=3216
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-format.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4790a405e9..56a1c7f226 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-05-26 Dan Winship <danw@helixcode.com> + + * mail-format.c (handle_via_bonobo): Update for PersistStream + changes + 2000-05-25 Ettore Perazzoli <ettore@helixcode.com> * main.c (main): Initialize the component factory. diff --git a/mail/mail-format.c b/mail/mail-format.c index ad7aa0fff6..46e279dd49 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1002,17 +1002,18 @@ handle_via_bonobo (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box) camel_medium_get_content_object (CAMEL_MEDIUM (part))); mimetype = g_strdup_printf ("%s/%s", type->type, type->subtype); goad_id = gnome_mime_get_value (mimetype, "bonobo-goad-id"); - g_free (mimetype); if (!goad_id) goad_id = gnome_mime_get_value (type->type, "bonobo-goad-id"); if (!goad_id) { + g_free (mimetype); handle_undisplayable (part, root, box); return; } embedded = bonobo_widget_new_subdoc (goad_id, NULL); if (!embedded) { + g_free (mimetype); handle_undisplayable (part, root, box); return; } @@ -1021,6 +1022,7 @@ handle_via_bonobo (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box) persist = (Bonobo_PersistStream) bonobo_object_client_query_interface ( server, "IDL:Bonobo/PersistStream:1.0", NULL); if (persist == CORBA_OBJECT_NIL) { + g_free (mimetype); bonobo_object_unref (BONOBO_OBJECT (embedded)); handle_undisplayable (part, root, box); return; @@ -1040,7 +1042,8 @@ handle_via_bonobo (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box) Bonobo_PersistStream_load (persist, bonobo_object_corba_objref ( BONOBO_OBJECT (bstream)), - &ev); + mimetype, &ev); + g_free (mimetype); bonobo_object_unref (BONOBO_OBJECT (bstream)); Bonobo_Unknown_unref (persist, &ev); CORBA_Object_release (persist, &ev); |