aboutsummaryrefslogtreecommitdiffstats
path: root/smime
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-10-10 12:54:36 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-10-10 12:54:36 +0800
commitb32649a94cd485f742d2ad5f1b76d7385393e137 (patch)
tree002248795c141c992667d73fbf34c40f394fbbf0 /smime
parent6a2861c3aa49e9439d3e665b0855222716add3a3 (diff)
downloadgsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.gz
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.bz2
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.lz
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.xz
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.zst
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.zip
** Fixes bug #437579
2007-10-09 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #437579 * addressbook/conduit/address-conduit.c: * addressbook/gui/component/addressbook-config.c: * addressbook/gui/contact-editor/e-contact-editor.c: * addressbook/gui/widgets/eab-gui-util.c: * calendar/conduits/calendar/calendar-conduit.c: * calendar/conduits/memo/memo-conduit.c: * calendar/conduits/todo/todo-conduit.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/dialogs/memo-page.c: * calendar/gui/dialogs/task-page.c: * calendar/gui/e-day-view-layout.c: * calendar/gui/e-day-view-layout.h: * calendar/gui/print.c: * e-util/e-pilot-map.c: * e-util/e-plugin.c: * e-util/e-profile-event.c: * e-util/e-signature.c: * filter/filter-file.c: * mail/e-searching-tokenizer.c: * mail/em-folder-browser.c: * mail/em-format-html.c: * mail/em-format-view.c: * mail/em-format.c: * mail/em-mailer-prefs.c: * mail/em-mailer-prefs.h: * mail/mail-session.c: * mail/mail-session.h: * mail/mail-vfolder.c: * mail/message-list.c: * plugins/bbdb/bbdb.c: * plugins/bbdb/gaimbuddies.c: * plugins/calendar-http/calendar-http.c: * plugins/exchange-operations/exchange-user-dialog.c: * plugins/face/face.c: * shell/e-shell-window.c: * shell/e-shell.c: * smime/lib/e-cert-db.c: * tools/killev.c: * widgets/misc/e-cursors.c: * widgets/misc/e-spinner.c: * widgets/misc/e-unicode.c: * widgets/table/e-table-field-chooser-item.c: * widgets/table/e-table-header-item.c: * widgets/table/e-table-header-item.h: * widgets/table/e-table-header-utils.c: * widgets/table/e-table.c: * widgets/text/e-text.c: Fix various compiler warnings. Patch from Milan Crha. svn path=/trunk/; revision=34368
Diffstat (limited to 'smime')
-rw-r--r--smime/ChangeLog7
-rw-r--r--smime/lib/e-cert-db.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index ea1d86266b..d9703c0efa 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-09 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #437579
+
+ * lib/e-cert-db.c:
+ Fix various compiler warnings. Patch from Milan Crha.
+
2007-09-14 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #476231
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index ef5cd77ea5..0655f99424 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -581,6 +581,7 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error)
{
ECert *certToShow;
SECItem der;
+ char *raw_der = NULL;
CERTCertificate *tmpCert;
/* First thing we have to do is figure out which certificate
@@ -648,11 +649,13 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error)
return FALSE;
}
- if (!e_cert_get_raw_der (certToShow, (char**)&der.data, &der.len)) {
+ if (!e_cert_get_raw_der (certToShow, &raw_der, &der.len)) {
/* XXX gerror */
return FALSE;
}
+ der.data = (unsigned char *)raw_der;
+
{
/*PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Creating temp cert\n"));*/
CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();