aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog10
-rw-r--r--camel/camel-formatter.c7
-rw-r--r--camel/providers/mbox/camel-mbox-folder.c1
3 files changed, 15 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 0362ea33ce..719e6286f9 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,13 @@
+2000-03-04 bertrand <bertrand@helixcode.com>
+
+ * camel-formatter.c (get_bonobo_tag_for_object):
+ bonobo-goad-id is the good key to look for.
+ (get_bonobo_tag_for_object): close the <object> tag.
+ (get_bonobo_tag_for_object): the correct syntax for the
+ to set a parameter inside an <object> tag is :
+ <object classid="..."> <param name="uid" value="..."> <param ...>
+ </object>
+
2000-03-03 bertrand <bertrand@helixcode.com>
* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
diff --git a/camel/camel-formatter.c b/camel/camel-formatter.c
index 1754d854fb..277de3956d 100644
--- a/camel/camel-formatter.c
+++ b/camel/camel-formatter.c
@@ -260,14 +260,17 @@ get_bonobo_tag_for_object (CamelFormatter* formatter,
CamelDataWrapper* root = formatter->priv->current_root;
char* uid = lookup_unique_id (root, wrapper);
const char* goad_id = gnome_mime_get_value (
- mimetype, "bonobo-goad_id");
+ mimetype, "bonobo-goad-id");
g_assert (root);
if (goad_id) {
+
char* tag = g_strdup_printf (
- "<object classid=\"%s\" uid=\"camel://%s\">",
+ "<object classid=\"%s\"> <param name=\"uid\" value=\"camel://%s\"> </object>",
goad_id, uid);
+
+ debug ("get_bonobo_tag_for_object: goad id %s found for mime type %s\n", goad_id, mimetype);
return tag;
}
else
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c
index 651580a5ff..cc3839abb6 100644
--- a/camel/providers/mbox/camel-mbox-folder.c
+++ b/camel/providers/mbox/camel-mbox-folder.c
@@ -1067,7 +1067,6 @@ _get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)
message = camel_mime_message_new_with_session (camel_service_get_session (CAMEL_SERVICE (parent_store)));
- //camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (message), message_stream);
camel_data_wrapper_set_input_stream (CAMEL_DATA_WRAPPER (message), message_stream);