rpms/evolution-data-server/F-8 evolution-data-server-1.12.3-efolder-leak.patch, NONE, 1.1 evolution-data-server.spec, 1.195, 1.196
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Mon Mar 24 15:17:19 UTC 2008
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution-data-server/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833
Modified Files:
evolution-data-server.spec
Added Files:
evolution-data-server-1.12.3-efolder-leak.patch
Log Message:
* Mon Mar 24 2008 Matthew Barnes <mbarnes at redhat.com> - 1.12.3-4.fc8
- Add patch for GNOME bug #523023 (EFolder leak in evo-ex-storage).
evolution-data-server-1.12.3-efolder-leak.patch:
--- NEW FILE evolution-data-server-1.12.3-efolder-leak.patch ---
diff -up evolution-data-server-1.12.3/servers/exchange/storage/exchange-hierarchy-webdav.c.efolder-leak evolution-data-server-1.12.3/servers/exchange/storage/exchange-hierarchy-webdav.c
--- evolution-data-server-1.12.3/servers/exchange/storage/exchange-hierarchy-webdav.c.efolder-leak 2007-10-12 02:29:37.000000000 -0400
+++ evolution-data-server-1.12.3/servers/exchange/storage/exchange-hierarchy-webdav.c 2008-03-24 11:13:52.000000000 -0400
@@ -756,10 +756,10 @@ scan_subtree (ExchangeHierarchy *hier, E
if (hwd->priv->deep_searchable &&
e_folder_exchange_get_has_subfolders (folder)) {
e_folder_exchange_set_has_subfolders (folder, FALSE);
- subtrees = g_slist_prepend (subtrees, folder);
+ subtrees = g_slist_prepend (subtrees, g_object_ref (folder));
}
exchange_hierarchy_new_folder (hier, folder);
- //g_object_unref (folder);
+ g_object_unref (folder);
/* Check the folder size here */
if (hier->type != EXCHANGE_HIERARCHY_PUBLIC) {
@@ -788,11 +788,16 @@ scan_subtree (ExchangeHierarchy *hier, E
while (subtrees) {
folder = subtrees->data;
subtrees = g_slist_remove (subtrees, folder);
+
/* Dont scan the subtree for deleteditems folder */
int_uri = e_folder_exchange_get_internal_uri (folder);
- if (int_uri && deleted_items_uri && !strcmp (int_uri, deleted_items_uri))
+ if (int_uri && deleted_items_uri && !strcmp (int_uri, deleted_items_uri)) {
+ g_object_unref (folder);
continue;
+ }
+
scan_subtree (hier, folder, mode);
+ g_object_unref (folder);
}
e_folder_exchange_set_rescan_tree (parent, FALSE);
Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-8/evolution-data-server.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- evolution-data-server.spec 20 Feb 2008 15:42:14 -0000 1.195
+++ evolution-data-server.spec 24 Mar 2008 15:16:06 -0000 1.196
@@ -27,7 +27,7 @@
Name: evolution-data-server
Version: 1.12.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPL
Group: System Environment/Libraries
Summary: Backend data server for Evolution
@@ -68,6 +68,9 @@
# RH bug #433469
Patch21: evolution-data-server-1.12.3-e2k-context-fba.patch
+# GNOME bug #523023
+Patch22: evolution-data-server-1.12.3-efolder-leak.patch
+
### Dependencies ###
Requires: GConf2
@@ -158,6 +161,7 @@
%patch19 -p1 -b .fix-64bit-acinclude
%patch20 -p1 -b .camel-shutdown
%patch21 -p1 -b .e2k-context-fba
+%patch22 -p1 -b .efolder-leak
gtkdocize
@@ -392,6 +396,9 @@
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog
+* Mon Mar 24 2008 Matthew Barnes <mbarnes at redhat.com> - 1.12.3-4.fc8
+- Add patch for GNOME bug #523023 (EFolder leak in evo-ex-storage).
+
* Wed Feb 20 2008 Matthew Barnes <mbarnes at redhat.com> - 1.12.3-3.fc8
- Add patch for RH bug #433469 (crash on Exchange authentication).
More information about the fedora-extras-commits
mailing list