[evolution-mapi/gnome-3-4] Bug #678952 - Not all named properties are converted to server tags

[Milan Crha <mcrha src gnome org>]

commit 2e95520edccd32858c1219d83d0dea366001aa7a
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 28 17:44:45 2012 +0200

    Bug #678952 - Not all named properties are converted to server tags

 src/libexchangemapi/e-mapi-connection.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
index 8c24d8c..7b63970 100644
--- a/src/libexchangemapi/e-mapi-connection.c
+++ b/src/libexchangemapi/e-mapi-connection.c
@@ -1155,7 +1155,7 @@ maybe_add_named_id_tag (uint32_t proptag,
 	g_return_if_fail (named_ids_list != NULL);
 	g_return_if_fail (named_ids_len != NULL);
 
-	if (((proptag >> 16) & 0xFFFF) >= 0x8000) {
+	if (get_namedid_name (proptag)) {
 		if (!*named_ids_list) {
 			*named_ids_list = g_new0 (EResolveNamedIDsData, 1);
 			*named_ids_len = 0;
@@ -2215,7 +2215,7 @@ ensure_additional_properties_cb (EMapiConnection *conn,
 		uint32_t prop = additional_properties[ii].orig_proptag;
 
 		if (!e_mapi_util_find_array_propval (&object->properties, prop)) {
-			if (((prop >> 16) & 0xFFFF) >= 0x8000) {
+			if (get_namedid_name (prop)) {
 				prop = e_mapi_connection_resolve_named_prop (conn, eap->obj_folder, prop, cancellable, NULL);
 			}
 		} else {