aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/conduit
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-01-15 23:16:25 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-01-16 10:50:05 +0800
commitcae22334fa6bc395ccc421b09e0af94c89297c41 (patch)
tree84881f467c0448db044d8bb3533e044a7152bb2b /addressbook/conduit
parentd37784ed3db20fd74ea4b8d9fdfe58518370cea2 (diff)
downloadgsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.gz
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.bz2
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.lz
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.xz
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.tar.zst
gsoc2013-evolution-cae22334fa6bc395ccc421b09e0af94c89297c41.zip
Remove dead assignments found by clang.
Diffstat (limited to 'addressbook/conduit')
-rw-r--r--addressbook/conduit/address-conduit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 3c2436dc27..73fb68b0ee 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -1147,7 +1147,6 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
{
EContactAddress *address = NULL;
gint phone = entryPhone1;
- EContactField field;
gboolean syncable;
gint i;
@@ -1222,9 +1221,10 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE), ctxt->pilot_charset);
/* See if the default has something in it */
- if ((address = e_contact_get (contact, ctxt->cfg->default_address))) {
- field = ctxt->cfg->default_address;
- } else {
+ address = e_contact_get (contact, ctxt->cfg->default_address);
+ if (address == NULL) {
+ EContactField field;
+
/* Try to find a non-empty address field */
for (field = E_CONTACT_FIRST_ADDRESS_ID; field <= E_CONTACT_LAST_ADDRESS_ID; field++) {
if ((address = e_contact_get (contact, field)))