aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-01-20 13:54:53 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-01-20 13:54:53 +0800
commitb6436c2a972e485bbd72c41b311a7cd35a1a17f2 (patch)
treec15a93c1fadd07d43c73f1823a6fd862d81e997e
parent7894cabd880fff2e049ac8d7421da37a2612bdff (diff)
downloadgsoc2013-evolution-b6436c2a972e485bbd72c41b311a7cd35a1a17f2.tar
gsoc2013-evolution-b6436c2a972e485bbd72c41b311a7cd35a1a17f2.tar.gz
gsoc2013-evolution-b6436c2a972e485bbd72c41b311a7cd35a1a17f2.tar.bz2
gsoc2013-evolution-b6436c2a972e485bbd72c41b311a7cd35a1a17f2.tar.lz
gsoc2013-evolution-b6436c2a972e485bbd72c41b311a7cd35a1a17f2.tar.xz
gsoc2013-evolution-b6436c2a972e485bbd72c41b311a7cd35a1a17f2.tar.zst
gsoc2013-evolution-b6436c2a972e485bbd72c41b311a7cd35a1a17f2.zip
don't remove the tree node if deleting the cert failed. (delete_your):
2004-11-23 Not Zed <NotZed@Ximian.com> * gui/certificate-manager.c (delete_ca): don't remove the tree node if deleting the cert failed. (delete_your): same. (delete_contact): same. Hoorah for code-reuse. svn path=/trunk/; revision=28456
-rw-r--r--smime/ChangeLog7
-rw-r--r--smime/gui/certificate-manager.c12
2 files changed, 13 insertions, 6 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 412d293dd3..cfe556db97 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-23 Not Zed <NotZed@Ximian.com>
+
+ * gui/certificate-manager.c (delete_ca): don't remove the tree
+ node if deleting the cert failed.
+ (delete_your): same.
+ (delete_contact): same. Hoorah for code-reuse.
+
2004-10-13 JP Rosevear <jpr@novell.com>
* gui/e-cert-selector.c: update to use G_DEFINE_TYPE
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 16bb261bfc..2e1f92a030 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -177,10 +177,10 @@ delete_your (GtkWidget *widget, CertificateManagerData *cfm)
4, &cert,
-1);
- if (cert) {
+ if (cert
+ && e_cert_db_delete_cert (e_cert_db_peek (), cert)) {
GtkTreeIter child_iter;
printf ("DELETE\n");
- e_cert_db_delete_cert (e_cert_db_peek (), cert);
gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (cfm->yourcerts_streemodel),
&child_iter,
&iter);
@@ -421,10 +421,10 @@ delete_contact (GtkWidget *widget, CertificateManagerData *cfm)
3, &cert,
-1);
- if (cert) {
+ if (cert
+ && e_cert_db_delete_cert (e_cert_db_peek (), cert)) {
GtkTreeIter child_iter;
printf ("DELETE\n");
- e_cert_db_delete_cert (e_cert_db_peek (), cert);
gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (cfm->contactcerts_streemodel),
&child_iter,
&iter);
@@ -640,10 +640,10 @@ delete_ca (GtkWidget *widget, CertificateManagerData *cfm)
1, &cert,
-1);
- if (cert) {
+ if (cert
+ && e_cert_db_delete_cert (e_cert_db_peek (), cert)) {
GtkTreeIter child_iter;
printf ("DELETE\n");
- e_cert_db_delete_cert (e_cert_db_peek (), cert);
gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (cfm->authoritycerts_streemodel),
&child_iter,
&iter);