Hello community,
here is the log from the commit of package evolution-exchange
checked in at Thu Nov 20 15:20:18 CET 2008.
--------
--- GNOME/evolution-exchange/evolution-exchange.changes 2008-11-03 12:22:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/evolution-exchange/evolution-exchange.changes 2008-11-20 12:10:48.811431000 +0100
@@ -1,0 +2,11 @@
+Thu Nov 20 10:40:30 CET 2008 - abharath@suse.de
+
+- Patches added
+ + bgo#540346 - bgo-540346-connection-fetch-contacts.patch - Do
+ not try to fetch contacts when not connected.
+ + bnc#441347 - bnc-441347-exchange-performance-fix.patch -
+ Evolution 2.24 is terribly slow with large folders.
+ + bnc#441712 - bnc-441712-error-loading-gal.patch - Error while
+ loading GAL.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
bgo-540346-connection-fetch-contacts.patch
bnc-441347-exchange-performance-fix.patch
bnc-441712-error-loading-gal.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-exchange.spec ++++++
--- /var/tmp/diff_new_pack.M16502/_old 2008-11-20 15:20:04.000000000 +0100
+++ /var/tmp/diff_new_pack.M16502/_new 2008-11-20 15:20:04.000000000 +0100
@@ -45,9 +45,15 @@
Group: Productivity/Networking/Email/Utilities
AutoReqProv: on
Version: 2.24.1
-Release: 3
+Release: 4
Summary: Evolution Connector for Microsoft Exchange Server 2000/2003
Source: ftp://ftp.gnome.org/pub/GNOME/sources/evolution-exchange/2.24/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM bgo-540346-connection-fetch-contacts.patch bgo540346 -- Fix has been submitted upstream.
+Patch1: bgo-540346-connection-fetch-contacts.patch
+# PATCH-FIX-UPSTREAM bnc-441347-exchange-performance-fix.patch bnc441347 bgo558883 -- Fix has been submitted upstream.
+Patch2: bnc-441347-exchange-performance-fix.patch
+# PATCH-FIX-UPSTREAM bnc-441712-error-loading-gal.patch bnc441712 shashish@novell.com -- Patch yet to be pushed upstream.
+Patch3: bnc-441712-error-loading-gal.patch
Url: http://www.novell.com/products/connector
BuildRoot: %{_tmppath}/%{name}-%{version}-build
DocDir: %{_defaultdocdir}/evolution-exchange
@@ -130,6 +136,9 @@
%lang_package
%prep
%setup -q
+%patch1
+%patch2
+%patch3
%build
autoreconf -f -i
@@ -181,6 +190,14 @@
%{_datadir}/gtk-doc/html/%{name}
%changelog
+* Thu Nov 20 2008 abharath@suse.de
+- Patches added
+ + bgo#540346 - bgo-540346-connection-fetch-contacts.patch - Do
+ not try to fetch contacts when not connected.
+ + bnc#441347 - bnc-441347-exchange-performance-fix.patch -
+ Evolution 2.24 is terribly slow with large folders.
+ + bnc#441712 - bnc-441712-error-loading-gal.patch - Error while
+ loading GAL.
* Mon Nov 03 2008 msuman@suse.de
- Clean up the spec file to use proper RPM macros.
- Do not use a custom libexec directory. It serves no purpose.
@@ -195,7 +212,7 @@
+ Minor fixes.
* Fri Oct 03 2008 sragavan@suse.de
- Make sure that Evolution/friends depend on evoldap2-client
-* Wed Sep 24 2008 maw@suse.de
+* Tue Sep 23 2008 maw@suse.de
- Update to version 2.24.0:
+ Bugs fixed: bgo#550160, bgo#546972, and bgo#552013
+ Updated translations.
@@ -307,7 +324,7 @@
* Wed Aug 08 2007 maw@suse.de
- Use %%fdupes.
- Split off a -lang subpackage
-* Fri Aug 03 2007 maw@suse.de
+* Thu Aug 02 2007 maw@suse.de
- Update to version 2.11.6.1:
+ Mails from are a delegate are identified and headers that evo
can use are set
@@ -337,7 +354,7 @@
- Updated translations for the es, dz, eu, and gl locales.
* Wed Mar 28 2007 maw@suse.de
- Add the magic gconf scripts.
-* Wed Mar 28 2007 maw@suse.de
+* Tue Mar 27 2007 maw@suse.de
- Update to version 2.10.0
- Refresh warning-fix.patch
- Explicity require notification-daemon
@@ -354,7 +371,7 @@
208395 cannot access a folder containing a "#" in the name
Fix for hang while viewing a HTML mail, which has images to
be loaded based on contacts.
-* Tue Oct 03 2006 jhargadon@suse.de
+* Mon Oct 02 2006 jhargadon@suse.de
- update to version 2.8.1
- translation updates
* Mon Sep 11 2006 vvaradhan@novell.com
@@ -405,7 +422,7 @@
334900 Crash while importing ics file into calendar
330674 Updated cancel meeting request exchange storage crashed - Chenthill
334727 Randomly doesnt display appointments
-* Wed Apr 05 2006 meissner@suse.de
+* Tue Apr 04 2006 meissner@suse.de
- added lzo-devel lzo to buildrequires to make it build on PLUS.
* Mon Mar 13 2006 vvaradhan@novell.com
- Update to version 2.6.0 - Fixes (bgo)
@@ -526,7 +543,7 @@
* Fri Jul 01 2005 gekker@suse.de
- Update to version 2.3.3
- Rename package from ximian-connector to evolution-exchange
-* Thu May 19 2005 ro@suse.de
+* Wed May 18 2005 ro@suse.de
- fix typo in specfile
* Wed May 18 2005 ro@suse.de
- for < 9.2 re-add patched openldap
@@ -536,7 +553,7 @@
- Preserve authentication credentials (x73627).
* Wed Mar 16 2005 gekker@suse.de
- Update to version 2.2.1
-* Wed Mar 09 2005 gekker@suse.de
+* Tue Mar 08 2005 gekker@suse.de
- Update to version 2.2.0 (GNOME 2.10).
* Thu Mar 03 2005 gekker@suse.de
- Update to version 2.1.6
@@ -567,15 +584,15 @@
- Remove the .a and .la files for the camel provider at build install time
* Mon Sep 27 2004 dobey@suse.de
- Fix dependency on evolution 1.5.94 to require >= 2.0 instead
-* Sat Sep 25 2004 dobey@suse.de
+* Fri Sep 24 2004 dobey@suse.de
- Update to 2.0.1
* Tue Sep 14 2004 dobey@suse.de
- Update to 2.0.0
-* Mon Aug 30 2004 dobey@suse.de
+* Sun Aug 29 2004 dobey@suse.de
- Update to 1.5.94
* Sat Aug 21 2004 dobey@suse.de
- Add openldap2 and cyrus-sasl2 builddeps
-* Wed Aug 18 2004 dobey@suse.de
+* Tue Aug 17 2004 dobey@suse.de
- Add MozillaFirefox libdir to rpath
* Sun Aug 15 2004 dobey@suse.de
- Update to 1.5.93
++++++ bgo-540346-connection-fetch-contacts.patch ++++++
--- addressbook/e-book-backend-gal.c 2008/11/04 02:52:58 1837
+++ addressbook/e-book-backend-gal.c 2008/11/05 11:01:23 1838
@@ -37,7 +37,7 @@
#include
#include "exchange-component.h"
-#define d(x) x
+#define d(x)
#include
@@ -342,7 +342,7 @@
}
else {
g_mutex_unlock (bl->priv->ldap_lock);
- printf("Connected and ldap is null sigh\n");
+ d(printf("Connected and ldap is null sigh\n"));
return FALSE;
}
}
@@ -567,7 +567,7 @@
EDataBookView *book_view;
int ldap_error;
- printf("get contact\n");
+ d(printf("get contact\n"));
switch (bl->priv->mode) {
case GNOME_Evolution_Addressbook_MODE_LOCAL:
#if ENABLE_CACHE
@@ -596,7 +596,7 @@
case GNOME_Evolution_Addressbook_MODE_REMOTE :
#if ENABLE_CACHE
- printf("Mode:Remote\n");
+ d(printf("Mode:Remote\n"));
if (bl->priv->marked_for_offline && bl->priv->file_db) {
EContact *contact = e_book_backend_db_cache_get_contact (bl->priv->file_db, id);
gchar *vcard_str ;
@@ -775,7 +775,7 @@
int ldap_error;
char *ldap_query;
- printf("get contact list\n");
+ d(printf("get contact list\n"));
switch (bl->priv->mode) {
case GNOME_Evolution_Addressbook_MODE_LOCAL:
#if ENABLE_CACHE
@@ -804,7 +804,7 @@
case GNOME_Evolution_Addressbook_MODE_REMOTE:
#if ENABLE_CACHE
- printf("Mode : Remote\n");
+ d(printf("Mode : Remote\n"));
if (bl->priv->marked_for_offline && bl->priv->file_db) {
GList *contacts;
GList *vcard_strings = NULL;
@@ -1374,7 +1374,7 @@
attr = ldap_first_attribute (bl->priv->ldap, e, &tber);
while (attr) {
if (!strcmp(attr, "member")) {
- printf("It is a DL\n");
+ d(printf("It is a DL\n"));
is_group = TRUE;
ldap_memfree (attr);
break;
@@ -1401,7 +1401,7 @@
g_mutex_unlock (bl->priv->ldap_lock);
for (i = 0; values[i]; i ++) {
if (!g_ascii_strcasecmp (values [i], "groupOfNames")) {
- printf ("groupOfNames\n");
+ d(printf ("groupOfNames\n"));
e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
e_contact_set (contact, E_CONTACT_LIST_SHOW_ADDRESSES, GINT_TO_POINTER (TRUE));
}
@@ -1462,7 +1462,7 @@
count = ldap_count_values (values);
member_info = g_new0 (gchar *, count+1);
- printf ("Fetching members\n");
+ d(printf ("Fetching members\n"));
for (i=0; values[i]; i++) {
/* get the email id for the given dn */
/* set base to DN and scope to base */
@@ -1609,11 +1609,10 @@
int msg_type;
d(printf ("ldap_search_handler (%p)\n", view));
- printf("%s:%s: search handler \n", G_STRLOC, G_STRFUNC);
g_mutex_lock (bl->priv->ldap_lock);
if (!bl->priv->ldap) {
g_mutex_unlock (bl->priv->ldap_lock);
- printf("%s:%s: other error\n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: other error\n", G_STRLOC, G_STRFUNC));
e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_OtherError);
ldap_op_finished (op);
return;
@@ -1652,7 +1651,6 @@
NULL, &ldap_error_msg, NULL, NULL, 0);
g_mutex_unlock (bl->priv->ldap_lock);
if (ldap_error != LDAP_SUCCESS) {
- printf("%s:%s: error result\n", G_STRLOC, G_STRFUNC);
g_warning ("ldap_search_handler: %02X (%s), additional info: %s",
ldap_error,
ldap_err2string (ldap_error), ldap_error_msg);
@@ -1670,7 +1668,6 @@
e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_Success);
else
e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_OtherError);
- printf("%s:%s: o/p %d %d\n", G_STRLOC, G_STRFUNC, ldap_error, LDAP_SUCCESS);
ldap_op_finished (op);
}
else {
@@ -1689,7 +1686,7 @@
d(printf ("ldap_search_dtor (%p)\n", search_op->view));
/* unhook us from our EDataBookView */
- printf ("ldap_search_dtor: Setting null inplace of %p in view %p\n", op, search_op->view);
+ d(printf ("ldap_search_dtor: Setting null inplace of %p in view %p\n", op, search_op->view));
g_object_set_data (G_OBJECT (search_op->view), "EBookBackendGAL.BookView::search_op", NULL);
bonobo_object_unref (search_op->view);
@@ -1737,7 +1734,7 @@
int view_limit;
GList *l;
- printf("start book view\n");
+ d(printf("start book view\n"));
switch (bl->priv->mode) {
case GNOME_Evolution_Addressbook_MODE_LOCAL:
#if ENABLE_CACHE
@@ -1765,11 +1762,11 @@
#endif
case GNOME_Evolution_Addressbook_MODE_REMOTE:
#if ENABLE_CACHE
- printf("Mode:Remote\n");
+ d(printf("Mode:Remote\n"));
if (bl->priv->marked_for_offline && bl->priv->file_db) {
const char *query = e_data_book_view_get_card_query (view);
GPtrArray *ids = NULL;
- printf("Marked for offline and cache present\n");
+ d(printf("Marked for offline and cache present\n"));
status = build_query (bl, e_data_book_view_get_card_query (view),
&ldap_query);
@@ -1789,7 +1786,7 @@
if (bl->priv->is_summary_ready &&
e_book_backend_summary_is_summary_query (bl->priv->summary, query)) {
- printf("Summary ready and summary_query, searching from summary \n");
+ d(printf("Summary ready and summary_query, searching from summary \n"));
ids = e_book_backend_summary_search (bl->priv->summary, query);
if (ids && ids->len > 0) {
get_contacts_from_cache (bl, query, ids, view);
@@ -1814,12 +1811,17 @@
}
else {
#endif
- printf("Not marked for offline or cache not there\n");
+ if (!bl->priv->connected) {
+ e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_RepositoryOffline);
+ return;
+ }
+
+ d(printf("Not marked for offline or cache not there\n"));
g_mutex_lock (bl->priv->ldap_lock);
if (!bl->priv->ldap) {
g_mutex_unlock (bl->priv->ldap_lock);
if (!gal_reconnect (bl, view, 0)) {
- printf("%s:%s: no ldap :(\n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: no ldap :(\n", G_STRLOC, G_STRFUNC));
e_data_book_view_notify_complete (view,
GNOME_Evolution_Addressbook_InvalidQuery);
return;
@@ -1847,12 +1849,12 @@
status = GNOME_Evolution_Addressbook_Success;
}
- printf("%s:%s: %s\n", G_STRLOC, G_STRFUNC, ldap_query ? ldap_query : "No ldap_query produced!");
+ d(printf("%s:%s: %s\n", G_STRLOC, G_STRFUNC, ldap_query ? ldap_query : "No ldap_query produced!"));
if (status != GNOME_Evolution_Addressbook_Success || !ldap_query) {
e_data_book_view_notify_complete (view, status);
if (ldap_query)
g_free (ldap_query);
- printf("%s:%s: failure \n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: failure \n", G_STRLOC, G_STRFUNC));
return;
}
@@ -1863,7 +1865,7 @@
book_view_notify_status (view, _("Searching..."));
g_mutex_lock (bl->priv->ldap_lock);
- printf("%s:%s: starting \n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: starting \n", G_STRLOC, G_STRFUNC));
ldap_err = ldap_search_ext (bl->priv->ldap, LDAP_ROOT_DSE,
LDAP_SCOPE_SUBTREE,
ldap_query,
@@ -1874,7 +1876,7 @@
view_limit,
&search_msgid);
g_mutex_unlock (bl->priv->ldap_lock);
- printf("%s:%s: %d\n", G_STRLOC, G_STRFUNC, ldap_err);
+ d(printf("%s:%s: %d\n", G_STRLOC, G_STRFUNC, ldap_err));
} else {
g_mutex_unlock (bl->priv->ldap_lock);
bl->priv->connected = FALSE;
@@ -1884,12 +1886,12 @@
g_free (ldap_query);
if (ldap_err != LDAP_SUCCESS) {
- printf("%s:%s: error\n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: error\n", G_STRLOC, G_STRFUNC));
book_view_notify_status (view, ldap_err2string(ldap_err));
return;
}
else if (search_msgid == -1) {
- printf("%s:%s: error\n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: error\n", G_STRLOC, G_STRFUNC));
book_view_notify_status (view,
_("Error performing search"));
return;
@@ -1898,7 +1900,6 @@
LDAPSearchOp *op = g_new0 (LDAPSearchOp, 1);
d(printf ("adding search_op (%p, %d)\n", view, search_msgid));
- printf("%s:%s: adding search \n", G_STRLOC, G_STRFUNC);
op->view = view;
op->aborted = FALSE;
@@ -1907,7 +1908,7 @@
ldap_op_add ((LDAPOp*)op, E_BOOK_BACKEND (bl), NULL, view,
0, search_msgid,
ldap_search_handler, ldap_search_dtor);
- printf("start_book_view: Setting op %p in book %p\n", op, view);
+ d(printf("start_book_view: Setting op %p in book %p\n", op, view));
g_object_set_data (G_OBJECT (view), "EBookBackendGAL.BookView::search_op", op);
}
#if ENABLE_CACHE
@@ -1925,7 +1926,7 @@
d(printf ("stop_book_view (%p)\n", view));
op = g_object_get_data (G_OBJECT (view), "EBookBackendGAL.BookView::search_op");
- printf("STOP BOOK VIEW: Getting op %p from view %p\n", op, view);
+ d(printf("STOP BOOK VIEW: Getting op %p from view %p\n", op, view));
if (op) {
op->aborted = TRUE;
ldap_op_finished ((LDAPOp*)op);
@@ -2069,7 +2070,7 @@
morePagedResults = 0;
}
if (cookie->bv_len>0) {
- printf("\n");
+ d(printf ("\n"));
}
else {
morePagedResults = 0;
@@ -2174,7 +2175,7 @@
char t[15];
LDAPControl c[6];
- printf ("Generate Cache\n");
+ d(printf ("Generate Cache\n"));
priv = book_backend_gal->priv;
@@ -2198,7 +2199,7 @@
if ( ber_flatten2( prber, &c[i].ldctl_value, 0 ) == -1 ) {
return;
}
- printf ("Setting parameters \n");
+ d(printf ("Setting parameters \n"));
c[i].ldctl_oid = LDAP_CONTROL_PAGEDRESULTS;
c[i].ldctl_iscritical = pagedResults > 1;
i++;
@@ -2223,11 +2224,11 @@
/* loop to get the next set of entries */
if ( (pageSize !=0 ) && (morePagedResults != 0)) {
- printf ("Start next iteration\n");
+ d(printf ("Start next iteration\n"));
goto getNextPage;
}
else
- printf ("All the entries fetched and finished building the cache\n");
+ d(printf ("All the entries fetched and finished building the cache\n"));
/* Set the cache to populated and thaw the changes */
@@ -2282,7 +2283,7 @@
if (!exchange_account_get_context (account)) {
exchange_account_set_online (account);
if(!exchange_account_connect (account, password, &result)) {
- printf("%s:%s: failed\n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: failed\n", G_STRLOC, G_STRFUNC));
e_data_book_respond_authenticate_user (book, opid, GNOME_Evolution_Addressbook_AuthenticationFailed);
return;
}
@@ -2300,7 +2301,7 @@
int diff;
char *t = e_book_backend_db_cache_get_time (be->priv->file_db);
- printf("Cache is populated, check if refresh is required \n");
+ d(printf("Cache is populated, check if refresh is required \n"));
if (t && *t)
t1 = atoi (t);
else
@@ -2309,14 +2310,14 @@
diff = interval * 24 * 60 *60;
/* We have a day specified, then we cache it. */
if (!diff || t2 - t1 > diff) {
- printf ("Cache older than specified period, refreshing \n");
+ d(printf ("Cache older than specified period, refreshing \n"));
generate_cache (be);
}
else
be->priv->is_summary_ready= TRUE;
}
else {
- printf("Cache not there, generate cache\n");
+ d(printf("Cache not there, generate cache\n"));
generate_cache(be);
}
}
@@ -2452,7 +2453,7 @@
guint32 opid)
{
- printf("%s:%s: NONE\n", G_STRLOC, G_STRFUNC);
+ d(printf("%s:%s: NONE\n", G_STRLOC, G_STRFUNC));
e_data_book_respond_get_supported_auth_methods (book,
opid,
GNOME_Evolution_Addressbook_Success,
@@ -2523,10 +2524,10 @@
return GNOME_Evolution_Addressbook_RepositoryOffline;
}
- printf("offlin==============\n");
+ d(printf("offlin==============\n"));
#if ENABLE_CACHE
if (bl->priv->marked_for_offline) {
- printf("offlin==============\n");
+ d(printf("offlin==============\n"));
bl->priv->summary_file_name = g_build_filename (g_get_home_dir(), ".evolution/cache/addressbook" , uri, book_name, NULL);
bl->priv->summary_file_name = g_build_filename (bl->priv->summary_file_name, "cache.summary", NULL);
bl->priv->summary = e_book_backend_summary_new (bl->priv->summary_file_name,
++++++ bnc-441347-exchange-performance-fix.patch ++++++
Index: camel/camel-exchange-folder.c
===================================================================
--- camel/camel-exchange-folder.c (revision 1838)
+++ camel/camel-exchange-folder.c (working copy)
@@ -50,10 +50,6 @@
static CamelOfflineFolderClass *parent_class = NULL;
-static CamelProperty exchange_property_list[] = {
- { CAMEL_EXCHANGE_FOLDER_CHECK_FOLDER, "check_folder", N_("Always check for new mail in this folder") },
-};
-
/* Returns the class for a CamelFolder */
#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
@@ -90,9 +86,6 @@ static void transfer_messages_the_hard
static void refresh_info (CamelFolder *folder, CamelException *ex);
static void exchange_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);
-static int exchange_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-static int exchange_setv (CamelObject *object, CamelException *ex, CamelArgV *args);
-
static void
class_init (CamelFolderClass *camel_folder_class)
{
@@ -111,9 +104,6 @@ class_init (CamelFolderClass *camel_fold
camel_folder_class->transfer_messages_to = transfer_messages_to;
camel_folder_class->refresh_info = refresh_info;
camel_folder_class->sync = exchange_sync;
-
- ((CamelObjectClass *)camel_folder_class)->getv = exchange_getv;
- ((CamelObjectClass *)camel_folder_class)->setv = exchange_setv;
}
#define CAMEL_EXCHANGE_SERVER_FLAGS \
@@ -155,8 +145,6 @@ camel_exchange_folder_get_type (void)
static CamelType camel_exchange_folder_type = CAMEL_INVALID_TYPE;
if (camel_exchange_folder_type == CAMEL_INVALID_TYPE) {
- int i;
-
camel_exchange_folder_type = camel_type_register (
camel_offline_folder_get_type (),
"CamelExchangeFolder",
@@ -166,10 +154,6 @@ camel_exchange_folder_get_type (void)
NULL,
(CamelObjectInitFunc) init,
(CamelObjectFinalizeFunc) finalize );
-
- /* only localize here, do not create GSList, we do not want to leak */
- for (i = 0; i < sizeof (exchange_property_list)/sizeof (exchange_property_list [0]); i++)
- exchange_property_list [i].description = _(exchange_property_list [i].description);
}
return camel_exchange_folder_type;
@@ -1143,78 +1127,3 @@ exchange_sync (CamelFolder *folder, gboo
camel_folder_summary_save_to_db (folder->summary, ex);
}
-
-static int
-exchange_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
- int i, count=0;
- guint32 tag;
-
- for (i = 0; i < args->argc; i++) {
- CamelArgGet *arg = &args->argv[i];
-
- tag = arg->tag;
-
- switch (tag & CAMEL_ARG_TAG) {
- case CAMEL_OBJECT_ARG_PERSISTENT_PROPERTIES:
- case CAMEL_FOLDER_ARG_PROPERTIES: {
- CamelArgGetV props;
- int i;
-
- props.argc = 1;
- props.argv[0] = *arg;
- ((CamelObjectClass *)parent_class)->getv(object, ex, &props);
-
- for (i = 0; i < sizeof (exchange_property_list)/sizeof (exchange_property_list [0]); i++)
- *arg->ca_ptr = g_slist_append (*arg->ca_ptr, &exchange_property_list[i]);
- break; }
- /* exchange args */
- case CAMEL_EXCHANGE_FOLDER_ARG_CHECK_FOLDER:
- *arg->ca_int = ((CamelExchangeFolder *)object)->check_folder;
- break;
- default:
- count++;
- continue;
- }
-
- arg->tag = (tag & CAMEL_ARG_TYPE) | CAMEL_ARG_IGNORE;
- }
-
- if (count)
- return ((CamelObjectClass *)parent_class)->getv (object, ex, args);
-
- return 0;
-}
-
-static int
-exchange_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
-{
- int save = 0;
- int i;
- guint32 tag;
-
- for (i = 0; i < args->argc; i++) {
- CamelArg *arg = &args->argv[i];
-
- tag = arg->tag;
-
- switch (tag & CAMEL_ARG_TAG) {
- case CAMEL_EXCHANGE_FOLDER_ARG_CHECK_FOLDER:
- if (((CamelExchangeFolder *)object)->check_folder != arg->ca_int) {
- ((CamelExchangeFolder *)object)->check_folder = arg->ca_int;
- save = 1;
- }
- break;
- default:
- continue;
- }
-
- arg->tag = (tag & CAMEL_ARG_TYPE) | CAMEL_ARG_IGNORE;
- }
-
- if (save)
- camel_object_state_write (object);
-
- return ((CamelObjectClass *)parent_class)->setv (object, ex, args);
-}
-
Index: camel/camel-exchange-folder.h
===================================================================
--- camel/camel-exchange-folder.h (revision 1838)
+++ camel/camel-exchange-folder.h (working copy)
@@ -24,15 +24,6 @@ extern "C" {
#define CAMEL_EXCHANGE_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_EXCHANGE_FOLDER_TYPE, CamelExchangeFolderClass))
#define CAMEL_IS_EXCHANGE_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_EXCHANGE_FOLDER_TYPE))
-enum {
- CAMEL_EXCHANGE_FOLDER_ARG_CHECK_FOLDER = CAMEL_OFFLINE_FOLDER_ARG_LAST,
- CAMEL_EXCHANGE_FOLDER_ARG_LAST = CAMEL_OFFLINE_FOLDER_ARG_LAST + 0x100
-};
-
-enum {
- CAMEL_EXCHANGE_FOLDER_CHECK_FOLDER = CAMEL_EXCHANGE_FOLDER_ARG_CHECK_FOLDER | CAMEL_ARG_BOO,
-};
-
typedef struct {
CamelOfflineFolder parent_object;
@@ -42,7 +33,6 @@ typedef struct {
char *source;
GHashTable *thread_index_to_message_id;
- unsigned int check_folder:1;
} CamelExchangeFolder;
typedef struct {
Index: camel/camel-exchange-store.c
===================================================================
--- camel/camel-exchange-store.c (revision 1838)
+++ camel/camel-exchange-store.c (working copy)
@@ -1194,13 +1194,5 @@ exchange_can_refresh_folder (CamelStore
res = CAMEL_STORE_CLASS(parent_class)->can_refresh_folder (store, info, ex) ||
(camel_url_get_param (((CamelService *)store)->url, "check_all") != NULL);
- if (!res && !camel_exception_is_set (ex)) {
- CamelFolder *folder;
-
- folder = camel_store_get_folder (store, info->full_name, 0, ex);
- if (folder && CAMEL_IS_EXCHANGE_FOLDER (folder))
- res = CAMEL_EXCHANGE_FOLDER (folder)->check_folder;
- }
-
return res;
}
++++++ bnc-441712-error-loading-gal.patch ++++++
Index: addressbook/e-book-backend-gal.c
===================================================================
--- addressbook/e-book-backend-gal.c (revision 1837)
+++ addressbook/e-book-backend-gal.c (working copy)
@@ -2140,7 +2140,7 @@
/* we hold the lock already */
rc = parse_page_control (bl->priv->ldap, msg, &cookie);
}
-
+ g_mutex_unlock (bl->priv->ldap_lock);
goto done;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org