[balsa] Revert 156e9fd830ba6ad043eb0afaf35e27d97ca5737d
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Revert 156e9fd830ba6ad043eb0afaf35e27d97ca5737d
- Date: Sun, 23 Jun 2019 02:20:47 +0000 (UTC)
commit 29b181032e7ee4dbf9bbfa2625b8670431ec93ad
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sat Jun 22 21:59:31 2019 -0400
Revert 156e9fd830ba6ad043eb0afaf35e27d97ca5737d
There's a better fix, to follow…
ChangeLog | 8 --------
libbalsa/address-book-rubrica.c | 3 +--
2 files changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c53845b91..c4ccbb4ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-2019-06-22 Peter Bloomfield <pbloomfield bellsouth net>
-
- address-book-rubrica: Do not crash if a card has multiple "Net"
- sections.
-
- * libbalsa/address-book-rubrica.c (extract_cards): Ignore all
- but the first "Net" section.
-
2019-06-22 Peter Bloomfield <pbloomfield bellsouth net>
* libbalsa/address-book-rubrica.c
diff --git a/libbalsa/address-book-rubrica.c b/libbalsa/address-book-rubrica.c
index b260fc492..79e0bb121 100644
--- a/libbalsa/address-book-rubrica.c
+++ b/libbalsa/address-book-rubrica.c
@@ -592,8 +592,7 @@ extract_cards(xmlNodePtr card)
extract_work(children->children, &organization);
libbalsa_address_set_organization(address, organization);
g_free(organization);
- } else if (!xmlStrcmp(children->name, CXMLCHARP("Net"))
- && address_list == NULL) {
+ } else if (!xmlStrcmp(children->name, CXMLCHARP("Net"))) {
extract_net(children->children, &address_list);
libbalsa_address_set_addr_list(address, address_list);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]