renamed variable 'interface' to 'iface'.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2850 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 16 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 2cc7d94b..b2574e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-01
+
+	* src/addressadd.c
+	  src/addrindex.c: renamed variable 'interface' to 'iface'.
+
 2011-02-28
 
 	* src/addressbook.c
diff --git a/src/addressadd.c b/src/addressadd.c
index 440cc517..dcca18a4 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -304,9 +304,9 @@ static void addressadd_load_data( AddressIndex *addrIndex ) {
 	gtk_clist_clear( GTK_CLIST( tree ) );
 	list = addrindex_get_interface_list( addrIndex );
 	while( list ) {
-		AddressInterface *interface = list->data;
-		if( interface->type == ADDR_IF_BOOK ) {
-			nodeDS = interface->listSource;
+		AddressInterface *iface = list->data;
+		if( iface->type == ADDR_IF_BOOK ) {
+			nodeDS = iface->listSource;
 			while( nodeDS ) {
 				ds = nodeDS->data;
 				if ( !strcmp( addrindex_ds_get_name( ds ), ADDR_DS_AUTOREG ) )
@@ -395,7 +395,7 @@ gboolean addressadd_autoreg(AddressIndex *addrIndex, const gchar *name,
 			    const gchar *address, const gchar *remarks)
 {
 	ItemPerson *person = NULL;
-	AddressInterface *interface = NULL;
+	AddressInterface *iface = NULL;
 	AddressDataSource *ds = NULL;
 	AddressBookFile *abf = NULL;
 	GList *node_ds;
@@ -406,11 +406,11 @@ gboolean addressadd_autoreg(AddressIndex *addrIndex, const gchar *name,
 	if (!name)
 		name = "";
 
-	interface = addrindex_get_interface(addrIndex, ADDR_IF_BOOK);
-	if (!interface)
+	iface = addrindex_get_interface(addrIndex, ADDR_IF_BOOK);
+	if (!iface)
 		return FALSE;
 
-	for (node_ds = interface->listSource; node_ds != NULL;
+	for (node_ds = iface->listSource; node_ds != NULL;
 	     node_ds = node_ds->next) {
 		ds = node_ds->data;
 		ds_name = addrindex_ds_get_name(ds);
diff --git a/src/addrindex.c b/src/addrindex.c
index c18b9595..efe0b3f1 100644
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1684,17 +1684,17 @@ gint addrindex_create_new_books( AddressIndex *addrIndex ) {
 
 gint addrindex_create_extra_books( AddressIndex *addrIndex ) {
 	GList *node_ds;
-	AddressInterface *interface = NULL;
+	AddressInterface *iface = NULL;
 	AddressDataSource *ds = NULL;
 	const gchar *ds_name;
 
 	g_return_val_if_fail(addrIndex != NULL, -1);
 
-	interface = addrindex_get_interface(addrIndex, ADDR_IF_BOOK);
-	if (!interface)
+	iface = addrindex_get_interface(addrIndex, ADDR_IF_BOOK);
+	if (!iface)
 		return -1;
 
-	for (node_ds = interface->listSource; node_ds != NULL;
+	for (node_ds = iface->listSource; node_ds != NULL;
 	     node_ds = node_ds->next) {
 		ds = node_ds->data;
 		ds_name = addrindex_ds_get_name(ds);