diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 8 | ||||
| -rw-r--r-- | mail/em-format.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6e0039d345..70e2fd9211 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2008-08-07 Matthew Barnes <mbarnes@redhat.com> + + * em-format.c (emf_format_secure): + * em-format-html-display.c (efhd_xpkcs7mime_add_cert_table): + Use CamelDList instead of EDList. + 2008-08-06 Milan Crha <mcrha@redhat.com> ** Fix for bug #249844 diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index d34f08a837..c2329c08bf 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -1030,10 +1030,10 @@ efhd_xpkcs7mime_viewcert_clicked(GtkWidget *button, struct _smime_pobject *po) #endif static void -efhd_xpkcs7mime_add_cert_table(GtkWidget *vbox, EDList *certlist, struct _smime_pobject *po) +efhd_xpkcs7mime_add_cert_table(GtkWidget *vbox, CamelDList *certlist, struct _smime_pobject *po) { CamelCipherCertInfo *info = (CamelCipherCertInfo *)certlist->head; - GtkTable *table = (GtkTable *)gtk_table_new(e_dlist_length(certlist), 2, FALSE); + GtkTable *table = (GtkTable *)gtk_table_new(camel_dlist_length(certlist), 2, FALSE); int n = 0; while (info->next) { @@ -1135,7 +1135,7 @@ efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6); } - if (!e_dlist_empty(&po->valid->sign.signers)) + if (!camel_dlist_empty(&po->valid->sign.signers)) efhd_xpkcs7mime_add_cert_table(vbox, &po->valid->sign.signers, po); gtk_widget_show_all(vbox); @@ -1167,7 +1167,7 @@ efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6); } - if (!e_dlist_empty(&po->valid->encrypt.encrypters)) + if (!camel_dlist_empty(&po->valid->encrypt.encrypters)) efhd_xpkcs7mime_add_cert_table(vbox, &po->valid->encrypt.encrypters, po); gtk_widget_show_all(vbox); diff --git a/mail/em-format.c b/mail/em-format.c index 9971528acd..483b86cf34 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -735,7 +735,7 @@ emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel if (emf->valid == NULL) { emf->valid = valid; } else { - e_dlist_addtail(&emf->valid_parent->children, (EDListNode *)valid); + camel_dlist_addtail(&emf->valid_parent->children, (CamelDListNode *)valid); camel_cipher_validity_envelope(emf->valid_parent, valid); } |