aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/merging/eab-contact-merging.c
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 07:09:19 +0800
commit8771a6de3590d468d1a2c3cfab34955c624f614a (patch)
treedc23ed6ab0533bc9f241976f33b6c6cc2d7ee117 /addressbook/gui/merging/eab-contact-merging.c
parent69a1e923a71ee881721e21b991de08b897f9e7b0 (diff)
downloadgsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.gz
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.bz2
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.lz
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.xz
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.tar.zst
gsoc2013-evolution-8771a6de3590d468d1a2c3cfab34955c624f614a.zip
More code cleanup.
Diffstat (limited to 'addressbook/gui/merging/eab-contact-merging.c')
-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 983de5dab6..6e6224835c 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);