[evolution-data-server/openismus-phonenumber-work] phone util: fix compile errors when libphonebook is not available

[Mathias Hasselmann <hasselmm src gnome org>]

commit f188de149d924f267f390c25cc6c37a9ab1acfa3
Author: Patrick Ohly <patrick ohly intel com>
Date:   Fri Dec 7 22:00:56 2012 +0100

    phone util: fix compile errors when libphonebook is not available
    
    e_phone_number_match() depends on libphonebook and must not
    be enabled when that is missing.
    
    e_phone_number_compare() doesn't have a GError pointer.

 libedataserver/e-phone-utils.cpp |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/libedataserver/e-phone-utils.cpp b/libedataserver/e-phone-utils.cpp
index d2ad7b6..87756ec 100644
--- a/libedataserver/e-phone-utils.cpp
+++ b/libedataserver/e-phone-utils.cpp
@@ -220,6 +220,8 @@ e_phone_number_to_string (const EPhoneNumber *phone_number,
 	return NULL;
 }
 
+#ifdef ENABLE_PHONENUMBER
+
 static EPhoneNumberMatch
 e_phone_number_match (PhoneNumberUtil::MatchType match_type)
 {
@@ -238,6 +240,8 @@ e_phone_number_match (PhoneNumberUtil::MatchType match_type)
 	g_return_val_if_reached (E_PHONE_NUMBER_MATCH_NONE);
 }
 
+#endif /* ENABLE_PHONENUMBER */
+
 EPhoneNumberMatch
 e_phone_number_compare	(const EPhoneNumber *first_number,
 			 const EPhoneNumber *second_number)
@@ -245,8 +249,6 @@ e_phone_number_compare	(const EPhoneNumber *first_number,
 	g_return_val_if_fail (NULL != first_number, E_PHONE_NUMBER_MATCH_NONE);
 	g_return_val_if_fail (NULL != second_number, E_PHONE_NUMBER_MATCH_NONE);
 
-	EPhoneNumberMatch result = E_PHONE_NUMBER_MATCH_NONE;
-
 #ifdef ENABLE_PHONENUMBER
 
 	const PhoneNumberUtil::MatchType match_type =
@@ -255,15 +257,14 @@ e_phone_number_compare	(const EPhoneNumber *first_number,
 		               second_number->phone_number);
 
 	g_warn_if_fail (match_type != PhoneNumberUtil::INVALID_NUMBER);
-	result = e_phone_number_match (match_type);
+	return e_phone_number_match (match_type);
 
 #else /* ENABLE_PHONENUMBER */
 
-	e_phone_number_set_error (error, E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
+	g_warn_if_reached ();
+	return E_PHONE_NUMBER_MATCH_NONE;
 
 #endif /* ENABLE_PHONENUMBER */
-
-	return result;
 }
 
 EPhoneNumberMatch