[evolution-mapi/f17] Add patch for Gnome bug #678952 (Some named properties not converted)

Milan Crha mcrha at fedoraproject.org
Thu Jun 28 15:50:51 UTC 2012


commit f8317af80e4f514b91b6dd9efbab6b34250c9edf
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Jun 28 17:50:46 2012 +0200

    Add patch for Gnome bug #678952 (Some named properties not converted)

 evolution-mapi-3.4.3-namedids.patch |   22 ++++++++++++++++++++++
 evolution-mapi.spec                 |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/evolution-mapi-3.4.3-namedids.patch b/evolution-mapi-3.4.3-namedids.patch
new file mode 100644
index 0000000..3ae8962
--- /dev/null
+++ b/evolution-mapi-3.4.3-namedids.patch
@@ -0,0 +1,22 @@
+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 {
diff --git a/evolution-mapi.spec b/evolution-mapi.spec
index d4a6db1..4d27fbb 100644
--- a/evolution-mapi.spec
+++ b/evolution-mapi.spec
@@ -9,7 +9,7 @@
 
 Name: evolution-mapi
 Version: 3.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
 License: LGPLv2+
@@ -21,6 +21,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Patch01: evolution-mapi-3.4.3-send-failure.patch
 Patch02: evolution-mapi-3.4.3-openstream.patch
+Patch03: evolution-mapi-3.4.3-namedids.patch
 
 ### Dependencies ###
 
@@ -59,6 +60,7 @@ Development files needed for building things which link against %{name}.
 %setup -q
 %patch01 -p1 -b .send-failure
 %patch02 -p1 -b .openstream
+%patch03 -p1 -b .namedids
 
 %build
 
@@ -117,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* Thu Jun 28 2012 Milan Crha <mcrha at redhat.com> - 3.4.3-4
+- Add patch for Gnome bug #678952 (Some named properties not converted)
+
 * Thu Jun 28 2012 Milan Crha <mcrha at redhat.com> - 3.4.3-3
 - Add patch for Red Hat bug #835178 (OpenStream failed on write)
 


More information about the scm-commits mailing list