aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/merging
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-06-02 07:09:19 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-06-02 22:35:03 +0800
commit433eac7844481b8ceda0bae8bf08f6bb623185b0 (patch)
treed66a04ad4fa676b4bfce762dee09a82f4434d374 /addressbook/gui/merging
parente6c6cbdfb5fd5723ff840b24b29690235be0d74d (diff)
downloadgsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.gz
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.bz2
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.lz
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.xz
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.zst
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.zip
More code cleanup.
Diffstat (limited to 'addressbook/gui/merging')
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index c8d795b2e8..1be9758627 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -183,7 +183,7 @@ dropdown_changed (GtkWidget *dropdown, dropdown_data *data)
return;
}
-static int
+static gint
mergeit (EContactMergingLookup *lookup)
{
GtkWidget *scrolled_window, *label, *hbox, *dropdown;
@@ -218,7 +218,7 @@ mergeit (EContactMergingLookup *lookup)
num_of_email = g_list_length (email_attr_list);
/*we match all the string fields of the already existing contact and the new contact.*/
- for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) {
+ for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
dropdown_data *data = NULL;
string = (gchar *)e_contact_get_const (lookup->contact, field);
string1 = (gchar *)e_contact_get_const (lookup->match, field);
@@ -369,7 +369,7 @@ check_if_same (EContact *contact, EContact *match)
gint num_of_email;
gchar *str = NULL, *string = NULL, *string1 = NULL;
- for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) {
+ for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) {
email_attr_list = e_contact_get_attributes (match, E_CONTACT_EMAIL);
num_of_email = g_list_length (email_attr_list);