[empathy] Improve geocoding debugging and add more fields

[Xavier Claessens <xclaesse src gnome org>]

commit a980a2b3eaa634981b0ebfe950f50b515e43cf4a
Author: Pierre-Luc Beaudoin <pierre-luc beaudoin collabora co uk>
Date:   Tue Jun 30 12:35:55 2009 -0400

    Improve geocoding debugging and add more fields

 libempathy/empathy-tp-contact-factory.c |   42 +++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 96fdfda..27160a4 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -494,21 +494,47 @@ tp_contact_factory_geocode (EmpathyContact *contact)
 
 	address = geoclue_address_details_new ();
 
+	str = get_dup_string (location, EMPATHY_LOCATION_COUNTRY_CODE);
+	if (str != NULL) {
+		g_hash_table_insert (address,
+			g_strdup (GEOCLUE_ADDRESS_KEY_COUNTRYCODE), str);
+		DEBUG ("\t - countrycode: %s", str);
+	}
+
 	str = get_dup_string (location, EMPATHY_LOCATION_COUNTRY);
-	if (str != NULL)
-		g_hash_table_insert (address, g_strdup ("country"), str);
+	if (str != NULL) {
+		g_hash_table_insert (address,
+			g_strdup (GEOCLUE_ADDRESS_KEY_COUNTRY), str);
+		DEBUG ("\t - country: %s", str);
+	}
 
 	str = get_dup_string (location, EMPATHY_LOCATION_POSTAL_CODE);
-	if (str != NULL)
-		g_hash_table_insert (address, g_strdup ("postalcode"), str);
+	if (str != NULL) {
+		g_hash_table_insert (address,
+			g_strdup (GEOCLUE_ADDRESS_KEY_POSTALCODE), str);
+		DEBUG ("\t - postalcode: %s", str);
+	}
+
+	str = get_dup_string (location, EMPATHY_LOCATION_REGION);
+	if (str != NULL) {
+		g_hash_table_insert (address,
+			g_strdup (GEOCLUE_ADDRESS_KEY_REGION), str);
+		DEBUG ("\t - region: %s", str);
+	}
 
 	str = get_dup_string (location, EMPATHY_LOCATION_LOCALITY);
-	if (str != NULL)
-		g_hash_table_insert (address, g_strdup ("locality"), str);
+	if (str != NULL) {
+		g_hash_table_insert (address,
+			g_strdup (GEOCLUE_ADDRESS_KEY_LOCALITY), str);
+		DEBUG ("\t - locality: %s", str);
+	}
 
 	str = get_dup_string (location, EMPATHY_LOCATION_STREET);
-	if (str != NULL)
-		g_hash_table_insert (address, g_strdup ("street"), str);
+	if (str != NULL) {
+		g_hash_table_insert (address,
+			g_strdup (GEOCLUE_ADDRESS_KEY_STREET), str);
+		DEBUG ("\t - street: %s", str);
+	}
 
 	g_object_ref (contact);
 	geoclue_geocode_address_to_position_async (geocode, address,