1
0
OBS User unknown 2008-10-24 13:03:24 +00:00 committed by Git OBS Bridge
parent 88ffbd6f0d
commit c1bc354da0
7 changed files with 234 additions and 63 deletions

192
eds-core-mapi-changes.diff Normal file
View File

@ -0,0 +1,192 @@
diff -Nupr 1-eds/addressbook/libedata-book/e-book-backend-db-cache.c 2-eds/addressbook/libedata-book/e-book-backend-db-cache.c
--- 1-eds/addressbook/libedata-book/e-book-backend-db-cache.c 2008-10-01 16:11:20.000000000 +0530
+++ 2-eds/addressbook/libedata-book/e-book-backend-db-cache.c 2008-07-01 22:08:59.000000000 +0530
@@ -420,3 +420,41 @@ e_book_backend_db_cache_is_populated (DB
return TRUE;
}
}
+
+void
+e_book_backend_db_cache_set_time(DB *db, const char *t)
+{
+ DBT uid_dbt, vcard_dbt ;
+ int db_error ;
+
+ string_to_dbt ("last_update_time", &uid_dbt);
+ string_to_dbt (t, &vcard_dbt);
+
+ db_error = db->put (db, NULL, &uid_dbt, &vcard_dbt, 0);
+ if (db_error != 0) {
+ g_warning ("db->put failed with %d", db_error);
+ }
+}
+
+char *
+e_book_backend_db_cache_get_time (DB *db)
+{
+ DBT uid_dbt, vcard_dbt;
+ int db_error;
+ char *t;
+
+ string_to_dbt ("last_update_time", &uid_dbt);
+ memset (&vcard_dbt, 0, sizeof(vcard_dbt));
+ vcard_dbt.flags = DB_DBT_MALLOC;
+
+ db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt, 0);
+ if (db_error != 0) {
+ g_warning ("db->get failed with %d", db_error);
+ return NULL;
+ }
+ else {
+ t = g_strdup (vcard_dbt.data);
+ g_free (vcard_dbt.data);
+ return t;
+ }
+}
diff -Nupr 1-eds/addressbook/libedata-book/e-book-backend-db-cache.h 2-eds/addressbook/libedata-book/e-book-backend-db-cache.h
--- 1-eds/addressbook/libedata-book/e-book-backend-db-cache.h 2008-10-01 16:11:20.000000000 +0530
+++ 2-eds/addressbook/libedata-book/e-book-backend-db-cache.h 2008-09-05 11:24:08.000000000 +0530
@@ -25,6 +25,8 @@
#include <libebook/e-contact.h>
#include "db.h"
+G_BEGIN_DECLS
+
EContact* e_book_backend_db_cache_get_contact (DB *db, const char *uid);
void string_to_dbt(const char *str, DBT *dbt);
char *e_book_backend_db_cache_get_filename(DB *db);
@@ -39,9 +41,8 @@ gboolean e_book_backend_db_cache_exists
void e_book_backend_db_cache_set_populated (DB *db);
gboolean e_book_backend_db_cache_is_populated (DB *db);
GPtrArray* e_book_backend_db_cache_search (DB *db, const char *query);
-
-
-
+void e_book_backend_db_cache_set_time(DB *db, const char *t);
+char * e_book_backend_db_cache_get_time (DB *db);
G_END_DECLS
diff -Nupr 1-eds/calendar/ChangeLog 2-eds/calendar/ChangeLog
--- 1-eds/calendar/ChangeLog 2008-10-15 11:33:05.000000000 +0530
+++ 2-eds/calendar/ChangeLog 2008-10-20 16:03:01.000000000 +0530
@@ -157,6 +157,18 @@
(e_cal_util_parse_ics_file): Make the documentation reflect that these
functions either return a new icalcomponent or NULL.
+2008-07-18 Suman Manjunath <msuman@novell.com>
+
+ ** Added CAL_STATIC_CAPABILITY_CREATE_MESSAGES
+
+ * libecal/e-cal-util.h:
+ This static capability determines if a calendar backend can send
+ messages to recipients by itself. It is different from the
+ CAL_STATIC_CAPABILITY_SAVE_SCHEDULES from the fact that this new
+ capability is processed after the user has been prompted to send
+ an update. It is useful if the actual object needs some processing
+ after the messages are sent.
+
2008-07-18 Milan Crha <mcrha@redhat.com>
** Fix for bug #515998
diff -Nupr 1-eds/calendar/libecal/e-cal.c 2-eds/calendar/libecal/e-cal.c
--- 1-eds/calendar/libecal/e-cal.c 2008-10-01 16:11:33.000000000 +0530
+++ 2-eds/calendar/libecal/e-cal.c 2008-09-09 12:07:54.000000000 +0530
@@ -1386,7 +1386,16 @@ set_local_attachment_store (ECal *ecal)
priv->local_attachment_store =
g_filename_to_uri (filename, NULL, NULL);
g_free (filename);
+ } else if (g_str_has_prefix (priv->uri, "mapi://")) {
+ gchar *filename = g_build_filename (g_get_home_dir (),
+ ".evolution/cache/calendar",
+ mangled_uri,
+ NULL);
+ priv->local_attachment_store =
+ g_filename_to_uri (filename, NULL, NULL);
+ g_free (filename);
}
+
g_free (mangled_uri);
}
diff -Nupr 1-eds/calendar/libecal/e-cal-util.h 2-eds/calendar/libecal/e-cal-util.h
--- 1-eds/calendar/libecal/e-cal-util.h 2008-10-01 16:11:33.000000000 +0530
+++ 2-eds/calendar/libecal/e-cal-util.h 2008-07-18 16:29:46.000000000 +0530
@@ -115,6 +115,7 @@ gboolean e_cal_util_event_dates_match (i
#define CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ATTEND "organizer-must-attend"
#define CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS "organizer-not-email-address"
#define CAL_STATIC_CAPABILITY_REMOVE_ALARMS "remove-alarms"
+#define CAL_STATIC_CAPABILITY_CREATE_MESSAGES "create-messages"
#define CAL_STATIC_CAPABILITY_SAVE_SCHEDULES "save-schedules"
#define CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "no-conv-to-assign-task"
#define CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "no-conv-to-recur"
diff -Nupr 1-eds/servers/exchange/ChangeLog 2-eds/servers/exchange/ChangeLog
--- 1-eds/servers/exchange/ChangeLog 2008-10-20 10:19:25.000000000 +0530
+++ 2-eds/servers/exchange/ChangeLog 2008-10-20 16:03:01.000000000 +0530
@@ -14,6 +14,11 @@
* storage/exchange-account.c: (set_sf_prop): Do not store invalid
values in 'standard_uris', it leads to crash later.
+2008-09-19 Ashish Shrivastava <shashish@novell.com>
+
+ * lib/e2k-global-catalog.c (e2k_global_catalog_get_ldap): Don't set
+ ldap_error - prevents crashes for now.
+
2008-08-18 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #324203
@@ -233,6 +238,12 @@
* lib/e2k-result.c (prop_get_binary_array), (prop_get_binary):
Initialize 'length' before calling g_base64_decode().
+2007-11-11 Srinivasa Ragavan <sragavan@novell.com>
+
+ * lib/e2k-global-catalog.c: (e2k_global_catalog_set_password): Added a
+ new api to set password into gc.
+ * lib/e2k-global-catalog.h:
+
2007-10-27 Matthew Barnes <mbarnes@redhat.com>
* lib/e2k-user-dialog.c:
diff -Nupr 1-eds/servers/exchange/lib/e2k-global-catalog.c 2-eds/servers/exchange/lib/e2k-global-catalog.c
--- 1-eds/servers/exchange/lib/e2k-global-catalog.c 2008-10-01 16:11:00.000000000 +0530
+++ 2-eds/servers/exchange/lib/e2k-global-catalog.c 2008-09-19 14:34:53.000000000 +0530
@@ -435,8 +435,11 @@ e2k_global_catalog_get_ldap (E2kGlobalCa
err = get_ldap_connection (gc, op, gc->priv->server, 3268, &ldap);
+#if 0
+ //ldap_error = (gint *) g_malloc (sizeof (gint));
if (ldap_error)
*ldap_error = err;
+#endif
return ldap;
}
@@ -473,6 +476,13 @@ e2k_global_catalog_new (const char *serv
return gc;
}
+void
+e2k_global_catalog_set_password (E2kGlobalCatalog *gc, const char *password)
+{
+ g_free (gc->priv->password);
+ gc->priv->password = g_strdup (password);
+}
+
static const char *
lookup_mta (E2kGlobalCatalog *gc, E2kOperation *op, const char *mta_dn)
{
diff -Nupr 1-eds/servers/exchange/lib/e2k-global-catalog.h 2-eds/servers/exchange/lib/e2k-global-catalog.h
--- 1-eds/servers/exchange/lib/e2k-global-catalog.h 2008-10-01 16:11:00.000000000 +0530
+++ 2-eds/servers/exchange/lib/e2k-global-catalog.h 2008-09-09 12:07:54.000000000 +0530
@@ -117,6 +117,9 @@ E2kGlobalCatalogStatus e2k_global_catalo
const char *self_dn,
const char *delegate_dn);
+void
+e2k_global_catalog_set_password (E2kGlobalCatalog *gc, const char *password);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26a3d7a2e00df0a889dc8531ab9712cd18097c786b13a9cb788464f53b656f26
size 7860772

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee8d588cb0df72d976edb6bc695a185d45f063f92809ec7c47aae059565529ca
size 7868457

View File

@ -1,30 +0,0 @@
camel/providers/groupwise/ChangeLog (working copy)
2008-09-24 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #337479
* camel-groupwise-store.c: (groupwise_auth_loop):
Do not use uninitialized variables.
Index: camel/providers/groupwise/camel-groupwise-store.c
===================================================================
--- camel/providers/groupwise/camel-groupwise-store.c (revision 9597)
+++ camel/providers/groupwise/camel-groupwise-store.c (working copy)
@@ -180,7 +180,7 @@ groupwise_auth_loop (CamelService *servi
CamelGroupwiseStorePrivate *priv = groupwise_store->priv;
gboolean authenticated = FALSE;
char *uri;
- EGwConnectionErrors errors;
+ EGwConnectionErrors errors = {E_GW_CONNECTION_STATUS_INVALID_OBJECT, NULL};
if (priv->use_ssl && !g_str_equal (priv->use_ssl, "never"))
uri = g_strconcat ("https://", priv->server_name, ":", priv->port, "/soap", NULL);
@@ -222,7 +222,7 @@ groupwise_auth_loop (CamelService *servi
service->url->passwd = NULL;
camel_exception_clear (ex);
} else {
- camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, g_strdup (errors.description));
+ camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, errors.description ? errors.description : _("You must be working online to complete this operation"));
return FALSE;
}
} else

View File

@ -1,20 +0,0 @@
2008-10-06 Srinivasa Ragavan <sragavan@novell.com>
* camel/camel-folder-search.c: Allow thread based searches by falling
back on the old in-memory search model.
Change backported for evolution-data-server-2.24.0.
--- evolution-data-server-2.24.0/camel/camel-folder-search.c
+++ evolution-data-server-2.24.0/camel/camel-folder-search.c
@@ -420,8 +420,8 @@
p->ex = ex;
- /* We route body-contains search and uid search through memory and not via db. */
- if (uids || strstr((const char *) expr, "body-contains")) {
+ /* We route body-contains / thread based search and uid search through memory and not via db. */
+ if (strstr((const char *) expr, "body-contains") || strstr((const char *) expr, "match-threads")) {
/* setup our search list only contains those we're interested in */
search->summary = camel_folder_get_summary(search->folder);

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Oct 24 10:11:54 IST 2008 - msuman@suse.de
- Update to version 2.24.1
+ Bugs fixed: bgo#337479, bgo#364542, bgo#497928, bgo#511947,
bgo#514670, bgo#537718, bgo#544141, bgo#546406, bgo#546637,
bgo#547243, bgo#550466, bgo#550998, bgo#552261, bgo#552631,
bgo#553266, bgo#553298, bgo#553301, bgo#553944, bgo#554455,
bgo#554540, bgo#556372, bgo#556495, bgo#556688
+ Updated translations.
- Fix the prefix for NTLM patched OpenLDAP, also specify explicit
dependency on evoldap2-devel.
- Remove evolution-data-server-gw-no-network.patch. Fixed upstream.
- Remove evolution-data-server-thread-search.patch. Fixed upstream.
- Add eds-core-mapi-changes.diff: This contains changes in the core
code base for the MAPI provider.
-------------------------------------------------------------------
Wed Oct 8 18:40:59 CEST 2008 - sbrabec@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package evolution-data-server (Version 2.24.0)
# spec file for package evolution-data-server (Version 2.24.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -43,8 +43,8 @@ License: GPL v2 or later
Group: Development/Libraries/GNOME
AutoReqProv: on
Summary: Evolution Data Server
Version: 2.24.0
Release: 2
Version: 2.24.1
Release: 1
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.24/%{name}-%{version}.tar.bz2
Patch0: evolution-data-server-configure.patch
# PATCH-NEEDS-REBASE bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 -- was PATCH-FIX-UPSTREAM, and may be droppable
@ -57,17 +57,16 @@ Patch4: bnc-304835-ex-crash-after-restart.patch
Patch5: bnc-307861-calendar-auth.diff
# PATCH-FIX-UPSTREAM bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de -- Fix is in upstream svn from 2.22.2
Patch9: bgo-530514-check-to-handle-specific-server-response.diff
# PATCH-FIX-UPSTREAM evolution-data-server-gw-no-network.patch bgo337479 sbrabec@suse.cz -- GroupWise crashes if network is down
Patch14: evolution-data-server-gw-no-network.patch
# PATCH-FIX-UPSTREAM evolution-data-server-thread-search.patch bgo554455 sbrabec@suse.cz -- Fix broken Advanced search->Include threads.
Patch15: evolution-data-server-thread-search.patch
# Change patch below if we move away from /opt/gnome
# PATCH-FIX-OPENSUSE libgnomeui-dep.patch -- It avoids a build dependency on libgnomeui to speed up bootstrap
Patch99: libgnomeui-dep.patch
# This patch contains changes in the core code base for the MAPI provider.
Patch100: eds-core-mapi-changes.diff
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libsoup >= 2.2.6 mozilla-nss
Requires: %{name}-lang = %{version}
Requires: evoldap2-devel
%description
Evolution Data Server provides a central location for your address book
@ -120,9 +119,8 @@ documentation.
###%patch4
###%patch5
%patch9
%patch14
%patch15 -p1
%patch99
%patch100 -p1
%build
intltoolize --force --copy
@ -137,7 +135,7 @@ autoheader
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \
--libexecdir=%{_prefix}/lib/evolution-data-server \
--with-openldap=/usr/lib/evoldap \
--with-openldap=%{_libdir}/evoldap \
--with-krb5=/usr \
--with-krb4=/usr \
--enable-gnome-keyring \
@ -183,6 +181,20 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/*
%changelog
* Fri Oct 24 2008 msuman@suse.de
- Update to version 2.24.1
+ Bugs fixed: bgo#337479, bgo#364542, bgo#497928, bgo#511947,
bgo#514670, bgo#537718, bgo#544141, bgo#546406, bgo#546637,
bgo#547243, bgo#550466, bgo#550998, bgo#552261, bgo#552631,
bgo#553266, bgo#553298, bgo#553301, bgo#553944, bgo#554455,
bgo#554540, bgo#556372, bgo#556495, bgo#556688
+ Updated translations.
- Fix the prefix for NTLM patched OpenLDAP, also specify explicit
dependency on evoldap2-devel.
- Remove evolution-data-server-gw-no-network.patch. Fixed upstream.
- Remove evolution-data-server-thread-search.patch. Fixed upstream.
- Add eds-core-mapi-changes.diff: This contains changes in the core
code base for the MAPI provider.
* Wed Oct 08 2008 sbrabec@suse.cz
- Fixed broken Advanced search->Include threads (bgo#554455).
* Fri Oct 03 2008 mboman@suse.de