rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 1.11.3

Browse Source 
- Remove patch for GNOME bug #415922 (fixed upstream).
This commit is contained in:
Matthew Barnes 2007-06-04 16:50:37 +00:00
parent 6efa8ff28f
commit c30bc73770
7 changed files with 101 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-data-server-1.11.2.tar.bz2 evolution-data-server-1.11.3.tar.bz2

10
evolution-data-server-1.11.2-implicit-function-declarations.patch
View File

@ -1,10 +0,0 @@
--- evolution-data-server-1.11.2/calendar/libical/src/libical/icalvalue.c.implicit-function-declarations 2007-05-18 11:37:00.000000000 -0400
+++ evolution-data-server-1.11.2/calendar/libical/src/libical/icalvalue.c 2007-05-18 11:38:53.000000000 -0400
@@ -47,6 +47,7 @@
#include <stdlib.h> /* for atoi and atof */
#include <limits.h> /* for SHRT_MAX */
#include <locale.h>
+#include <ctype.h> /* for isspace and isdigit */
#ifdef WIN32
#define snprintf _snprintf

165
evolution-data-server-1.9.1-kill-ememory.patch
View File

@ -1,6 +1,6 @@
--- evolution-data-server-1.11.2/camel/camel-text-index.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400 --- evolution-data-server-1.11.3/camel/camel-text-index.c.kill-ememory 2007-06-01 03:06:38.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-text-index.c 2007-05-18 10:59:21.000000000 -0400 +++ evolution-data-server-1.11.3/camel/camel-text-index.c 2007-06-04 12:28:31.000000000 -0400
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@ typedef struct _CamelTextIndexNamePrivat
struct _CamelTextIndexNamePrivate { struct _CamelTextIndexNamePrivate {
GString *buffer; GString *buffer;
camel_key_t nameid; camel_key_t nameid;
@ -9,7 +9,7 @@
}; };
CamelTextIndexName *camel_text_index_name_new(CamelTextIndex *idx, const char *name, camel_key_t nameid); CamelTextIndexName *camel_text_index_name_new(CamelTextIndex *idx, const char *name, camel_key_t nameid);
@@ -1373,7 +1373,7 @@ @@ -1374,7 +1374,7 @@ text_index_name_add_word(CamelIndexName
struct _CamelTextIndexNamePrivate *p = ((CamelTextIndexName *)idn)->priv; struct _CamelTextIndexNamePrivate *p = ((CamelTextIndexName *)idn)->priv;
if (g_hash_table_lookup(idn->words, word) == NULL) { if (g_hash_table_lookup(idn->words, word) == NULL) {
@ -18,7 +18,7 @@
g_hash_table_insert(idn->words, w, w); g_hash_table_insert(idn->words, w, w);
} }
@@ -1501,7 +1501,7 @@ @@ -1502,7 +1502,7 @@ camel_text_index_name_init(CamelTextInde
p = idn->priv = g_malloc0(sizeof(*idn->priv)); p = idn->priv = g_malloc0(sizeof(*idn->priv));
p->buffer = g_string_new(""); p->buffer = g_string_new("");
@ -27,7 +27,7 @@
} }
static void static void
@@ -1512,7 +1512,7 @@ @@ -1513,7 +1513,7 @@ camel_text_index_name_finalise(CamelText
g_hash_table_destroy(idn->parent.words); g_hash_table_destroy(idn->parent.words);
g_string_free(p->buffer, TRUE); g_string_free(p->buffer, TRUE);
@ -36,7 +36,7 @@
g_free(p); g_free(p);
} }
@@ -1544,7 +1544,7 @@ @@ -1545,7 +1545,7 @@ camel_text_index_name_new(CamelTextIndex
cin->index = (CamelIndex *)idx; cin->index = (CamelIndex *)idx;
camel_object_ref((CamelObject *)idx); camel_object_ref((CamelObject *)idx);
@ -45,9 +45,9 @@
p->nameid = nameid; p->nameid = nameid;
return idn; return idn;
--- evolution-data-server-1.11.2/camel/camel-mime-parser.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400 --- evolution-data-server-1.11.3/camel/camel-mime-parser.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-mime-parser.c 2007-05-18 10:59:21.000000000 -0400 +++ evolution-data-server-1.11.3/camel/camel-mime-parser.c 2007-06-04 12:28:31.000000000 -0400
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@ struct _header_scan_stack {
camel_mime_parser_state_t savestate; /* state at invocation of this part */ camel_mime_parser_state_t savestate; /* state at invocation of this part */
#ifdef MEMPOOL #ifdef MEMPOOL
@ -56,7 +56,7 @@
#endif #endif
struct _camel_header_raw *headers; /* headers for this part */ struct _camel_header_raw *headers; /* headers for this part */
@@ -999,7 +999,8 @@ @@ -999,7 +999,8 @@ folder_pull_part(struct _header_scan_sta
s->parts = h->parent; s->parts = h->parent;
g_free(h->boundary); g_free(h->boundary);
#ifdef MEMPOOL #ifdef MEMPOOL
@ -66,7 +66,7 @@
#else #else
camel_header_raw_clear(&h->headers); camel_header_raw_clear(&h->headers);
#endif #endif
@@ -1107,20 +1108,16 @@ @@ -1107,20 +1108,16 @@ header_append_mempool(struct _header_sca
content = strchr(header, ':'); content = strchr(header, ':');
if (content) { if (content) {
register int len; register int len;
@ -90,7 +90,7 @@
n->offset = offset; n->offset = offset;
@@ -1178,7 +1175,7 @@ @@ -1178,7 +1175,7 @@ folder_scan_header(struct _header_scan_s
h = g_malloc0(sizeof(*h)); h = g_malloc0(sizeof(*h));
#ifdef MEMPOOL #ifdef MEMPOOL
@ -99,27 +99,27 @@
#endif #endif
if (s->parts) if (s->parts)
--- evolution-data-server-1.11.2/camel/camel-folder.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400 --- evolution-data-server-1.11.3/camel/camel-folder.c.kill-ememory 2007-06-04 01:40:57.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-folder.c 2007-05-18 10:59:24.000000000 -0400 +++ evolution-data-server-1.11.3/camel/camel-folder.c 2007-06-04 12:30:21.000000000 -0400
@@ -1894,7 +1894,7 @@ @@ -1755,7 +1755,7 @@ struct _CamelFolderChangeInfoPrivate {
struct _CamelFolderChangeInfoPrivate {
GHashTable *uid_stored; /* what we have stored, which array they're in */ GHashTable *uid_stored; /* what we have stored, which array they're in */
GHashTable *uid_source; /* used to create unique lists */ GHashTable *uid_source; /* used to create unique lists */
GPtrArray *uid_filter; /* uids to be filtered */
- struct _EMemPool *uid_pool; /* pool used to store copies of uid strings */ - struct _EMemPool *uid_pool; /* pool used to store copies of uid strings */
+ GStringChunk *uid_string_chunk; /* used to store copies of uid strings */ + GStringChunk *uid_string_chunk; /* used to store copies of uid strings */
}; };
@@ -1921,7 +1921,7 @@ @@ -1934,7 +1934,7 @@ camel_folder_change_info_new(void)
info->priv = g_malloc0(sizeof(*info->priv));
info->priv->uid_stored = g_hash_table_new(g_str_hash, g_str_equal); info->priv->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
info->priv->uid_source = NULL; info->priv->uid_source = NULL;
info->priv->uid_filter = g_ptr_array_new();
- info->priv->uid_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE); - info->priv->uid_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
+ info->priv->uid_string_chunk = g_string_chunk_new(512); + info->priv->uid_string_chunk = g_string_chunk_new(512);
return info; return info;
} }
@@ -1947,7 +1947,7 @@ @@ -1960,7 +1960,7 @@ camel_folder_change_info_add_source(Came
p->uid_source = g_hash_table_new(g_str_hash, g_str_equal); p->uid_source = g_hash_table_new(g_str_hash, g_str_equal);
if (g_hash_table_lookup(p->uid_source, uid) == NULL) if (g_hash_table_lookup(p->uid_source, uid) == NULL)
@ -128,7 +128,7 @@
} }
@@ -1976,7 +1976,7 @@ @@ -1989,7 +1989,7 @@ camel_folder_change_info_add_source_list
char *uid = list->pdata[i]; char *uid = list->pdata[i];
if (g_hash_table_lookup(p->uid_source, uid) == NULL) if (g_hash_table_lookup(p->uid_source, uid) == NULL)
@ -137,34 +137,7 @@
} }
} }
@@ -2136,7 +2136,7 @@ @@ -2101,7 +2101,7 @@ change_info_recent_uid(CamelFolderChange
return;
}
- olduid = e_mempool_strdup(p->uid_pool, uid);
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
g_ptr_array_add(info->uid_added, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_added);
}
@@ -2170,7 +2170,7 @@
return;
}
- olduid = e_mempool_strdup(p->uid_pool, uid);
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
g_ptr_array_add(info->uid_removed, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
}
@@ -2199,7 +2199,7 @@
return;
}
- olduid = e_mempool_strdup(p->uid_pool, uid);
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
g_ptr_array_add(info->uid_changed, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
}
@@ -2225,7 +2225,7 @@
/* always add to recent, but dont let anyone else know */ /* always add to recent, but dont let anyone else know */
if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) { if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
@ -173,28 +146,64 @@
} }
g_ptr_array_add(info->uid_recent, olduid); g_ptr_array_add(info->uid_recent, olduid);
} }
@@ -2274,7 +2274,8 @@ @@ -2117,7 +2117,7 @@ change_info_filter_uid(CamelFolderChange
/* always add to filter, but dont let anyone else know */
if (!g_hash_table_lookup_extended(p->uid_stored, uid, (void **)&olduid, (void **)&olduids)) {
- olduid = e_mempool_strdup(p->uid_pool, uid);
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
} }
g_ptr_array_add(p->uid_filter, olduid);
}
@@ -2182,7 +2182,7 @@ camel_folder_change_info_add_uid(CamelFo
return;
}
- olduid = e_mempool_strdup(p->uid_pool, uid);
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
g_ptr_array_add(info->uid_added, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_added);
}
@@ -2216,7 +2216,7 @@ camel_folder_change_info_remove_uid(Came
return;
}
- olduid = e_mempool_strdup(p->uid_pool, uid);
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
g_ptr_array_add(info->uid_removed, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_removed);
}
@@ -2245,7 +2245,7 @@ camel_folder_change_info_change_uid(Came
return;
}
- olduid = e_mempool_strdup(p->uid_pool, uid);
+ olduid = g_string_chunk_insert(p->uid_string_chunk, uid);
g_ptr_array_add(info->uid_changed, olduid);
g_hash_table_insert(p->uid_stored, olduid, info->uid_changed);
}
@@ -2314,7 +2314,8 @@ camel_folder_change_info_clear(CamelFold
g_hash_table_destroy(p->uid_stored); g_hash_table_destroy(p->uid_stored);
p->uid_stored = g_hash_table_new(g_str_hash, g_str_equal); p->uid_stored = g_hash_table_new(g_str_hash, g_str_equal);
g_ptr_array_set_size(p->uid_filter, 0);
- e_mempool_flush(p->uid_pool, TRUE); - e_mempool_flush(p->uid_pool, TRUE);
+ g_string_chunk_free(p->uid_string_chunk); + g_string_chunk_free(p->uid_string_chunk);
+ p->uid_string_chunk = g_string_chunk_new(512); + p->uid_string_chunk = g_string_chunk_new(512);
} }
@@ -2297,7 +2298,7 @@ @@ -2338,7 +2339,7 @@ camel_folder_change_info_free(CamelFolde
g_hash_table_destroy(p->uid_source);
g_hash_table_destroy(p->uid_stored); g_hash_table_destroy(p->uid_stored);
g_ptr_array_free(p->uid_filter, TRUE);
- e_mempool_destroy(p->uid_pool); - e_mempool_destroy(p->uid_pool);
+ g_string_chunk_free(p->uid_string_chunk); + g_string_chunk_free(p->uid_string_chunk);
g_free(p); g_free(p);
g_ptr_array_free(info->uid_added, TRUE); g_ptr_array_free(info->uid_added, TRUE);
--- evolution-data-server-1.11.2/camel/camel-folder-summary.c.kill-ememory 2007-05-09 00:09:34.000000000 -0400 --- evolution-data-server-1.11.3/camel/camel-folder-summary.c.kill-ememory 2007-06-01 03:06:38.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-folder-summary.c 2007-05-18 10:59:24.000000000 -0400 +++ evolution-data-server-1.11.3/camel/camel-folder-summary.c 2007-06-04 12:28:31.000000000 -0400
@@ -134,10 +134,6 @@ @@ -134,10 +134,6 @@ camel_folder_summary_init (CamelFolderSu
s->message_info_chunks = NULL; s->message_info_chunks = NULL;
s->content_info_chunks = NULL; s->content_info_chunks = NULL;
@ -205,7 +214,7 @@
s->version = CAMEL_FOLDER_SUMMARY_VERSION; s->version = CAMEL_FOLDER_SUMMARY_VERSION;
s->flags = 0; s->flags = 0;
s->time = 0; s->time = 0;
@@ -873,13 +869,6 @@ @@ -875,13 +871,6 @@ camel_folder_summary_add(CamelFolderSumm
CAMEL_SUMMARY_LOCK(s, summary_lock); CAMEL_SUMMARY_LOCK(s, summary_lock);
@ -219,9 +228,9 @@
g_ptr_array_add(s->messages, info); g_ptr_array_add(s->messages, info);
g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info); g_hash_table_insert(s->messages_uid, (char *)camel_message_info_uid(info), info);
s->flags |= CAMEL_SUMMARY_DIRTY; s->flags |= CAMEL_SUMMARY_DIRTY;
--- evolution-data-server-1.11.2/camel/providers/local/camel-maildir-summary.c.kill-ememory 2007-05-09 00:09:30.000000000 -0400 --- evolution-data-server-1.11.3/camel/providers/local/camel-maildir-summary.c.kill-ememory 2007-05-09 00:09:30.000000000 -0400
+++ evolution-data-server-1.11.2/camel/providers/local/camel-maildir-summary.c 2007-05-18 10:59:24.000000000 -0400 +++ evolution-data-server-1.11.3/camel/providers/local/camel-maildir-summary.c 2007-06-04 12:28:31.000000000 -0400
@@ -129,10 +129,6 @@ @@ -129,10 +129,6 @@ camel_maildir_summary_init (CamelMaildir
s->message_info_size = sizeof(CamelMaildirMessageInfo); s->message_info_size = sizeof(CamelMaildirMessageInfo);
s->content_info_size = sizeof(CamelMaildirMessageContentInfo); s->content_info_size = sizeof(CamelMaildirMessageContentInfo);
@ -232,7 +241,7 @@
if (gethostname(hostname, 256) == 0) { if (gethostname(hostname, 256) == 0) {
o->priv->hostname = g_strdup(hostname); o->priv->hostname = g_strdup(hostname);
} else { } else {
@@ -329,11 +325,9 @@ @@ -329,11 +325,9 @@ static CamelMessageInfo *message_info_ne
static void message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi) static void message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
{ {
@ -244,7 +253,7 @@
((CamelFolderSummaryClass *) parent_class)->message_info_free(s, mi); ((CamelFolderSummaryClass *) parent_class)->message_info_free(s, mi);
} }
@@ -412,7 +406,7 @@ @@ -412,7 +406,7 @@ static int maildir_summary_load(CamelLoc
struct dirent *d; struct dirent *d;
CamelMaildirSummary *mds = (CamelMaildirSummary *)cls; CamelMaildirSummary *mds = (CamelMaildirSummary *)cls;
char *uid; char *uid;
@ -253,7 +262,7 @@
int ret; int ret;
cur = g_strdup_printf("%s/cur", cls->folder_path); cur = g_strdup_printf("%s/cur", cls->folder_path);
@@ -429,7 +423,7 @@ @@ -429,7 +423,7 @@ static int maildir_summary_load(CamelLoc
} }
mds->priv->load_map = g_hash_table_new(g_str_hash, g_str_equal); mds->priv->load_map = g_hash_table_new(g_str_hash, g_str_equal);
@ -262,7 +271,7 @@
while ( (d = readdir(dir)) ) { while ( (d = readdir(dir)) ) {
if (d->d_name[0] == '.') if (d->d_name[0] == '.')
@@ -438,13 +432,13 @@ @@ -438,13 +432,13 @@ static int maildir_summary_load(CamelLoc
/* map the filename -> uid */ /* map the filename -> uid */
uid = strchr(d->d_name, ':'); uid = strchr(d->d_name, ':');
if (uid) { if (uid) {
@ -282,7 +291,7 @@
g_hash_table_insert(mds->priv->load_map, uid, uid); g_hash_table_insert(mds->priv->load_map, uid, uid);
} }
} }
@@ -455,7 +449,7 @@ @@ -455,7 +449,7 @@ static int maildir_summary_load(CamelLoc
g_hash_table_destroy(mds->priv->load_map); g_hash_table_destroy(mds->priv->load_map);
mds->priv->load_map = NULL; mds->priv->load_map = NULL;
@ -291,7 +300,7 @@
return ret; return ret;
} }
@@ -621,23 +615,8 @@ @@ -621,23 +615,8 @@ maildir_summary_check(CamelLocalSummary
filename = camel_maildir_info_filename(mdi); filename = camel_maildir_info_filename(mdi);
/* TODO: only store the extension in the mdi->filename struct, not the whole lot */ /* TODO: only store the extension in the mdi->filename struct, not the whole lot */
if (filename == NULL || strcmp(filename, d->d_name) != 0) { if (filename == NULL || strcmp(filename, d->d_name) != 0) {
@ -315,7 +324,7 @@
} }
camel_message_info_free(info); camel_message_info_free(info);
} }
@@ -727,9 +706,6 @@ @@ -727,9 +706,6 @@ maildir_summary_sync(CamelLocalSummary *
int count, i; int count, i;
CamelMessageInfo *info; CamelMessageInfo *info;
CamelMaildirMessageInfo *mdi; CamelMaildirMessageInfo *mdi;
@ -325,7 +334,7 @@
char *name; char *name;
struct stat st; struct stat st;
@@ -775,26 +751,8 @@ @@ -775,26 +751,8 @@ maildir_summary_sync(CamelLocalSummary *
/* we'll assume it didn't work, but dont change anything else */ /* we'll assume it didn't work, but dont change anything else */
g_free(newname); g_free(newname);
} else { } else {
@ -352,8 +361,8 @@
} }
g_free(name); g_free(name);
g_free(dest); g_free(dest);
--- evolution-data-server-1.11.2/camel/camel-folder-search.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400 --- evolution-data-server-1.11.3/camel/camel-folder-search.c.kill-ememory 2007-05-09 00:09:33.000000000 -0400
+++ evolution-data-server-1.11.2/camel/camel-folder-search.c 2007-05-18 10:59:24.000000000 -0400 +++ evolution-data-server-1.11.3/camel/camel-folder-search.c 2007-06-04 12:28:31.000000000 -0400
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
#define r(x) #define r(x)
@ -363,7 +372,7 @@
CamelException *ex; CamelException *ex;
CamelFolderThread *threads; CamelFolderThread *threads;
@@ -123,23 +123,23 @@ @@ -123,23 +123,23 @@ camel_folder_search_init (CamelFolderSea
obj->sexp = e_sexp_new(); obj->sexp = e_sexp_new();
@ -394,7 +403,7 @@
} }
static void static void
@@ -154,8 +154,8 @@ @@ -154,8 +154,8 @@ camel_folder_search_finalize (CamelObjec
g_hash_table_destroy(search->summary_hash); g_hash_table_destroy(search->summary_hash);
g_free(search->last_search); g_free(search->last_search);
@ -405,7 +414,7 @@
g_free(p); g_free(p);
} }
@@ -345,7 +345,7 @@ @@ -345,7 +345,7 @@ camel_folder_search_execute_expression(C
GPtrArray *matches; GPtrArray *matches;
int i; int i;
GHashTable *results; GHashTable *results;
@ -414,7 +423,7 @@
struct _CamelFolderSearchPrivate *p = _PRIVATE(search); struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
p->ex = ex; p->ex = ex;
@@ -374,11 +374,7 @@ @@ -374,11 +374,7 @@ camel_folder_search_execute_expression(C
/* now create a folder summary to return?? */ /* now create a folder summary to return?? */
if (r->type == ESEXP_RES_ARRAY_PTR) { if (r->type == ESEXP_RES_ARRAY_PTR) {
d(printf("got result ...\n")); d(printf("got result ...\n"));
@ -427,7 +436,7 @@
if (search->summary) { if (search->summary) {
/* reorder result in summary order */ /* reorder result in summary order */
results = g_hash_table_new(g_str_hash, g_str_equal); results = g_hash_table_new(g_str_hash, g_str_equal);
@@ -390,20 +386,21 @@ @@ -390,20 +386,21 @@ camel_folder_search_execute_expression(C
CamelMessageInfo *info = g_ptr_array_index(search->summary, i); CamelMessageInfo *info = g_ptr_array_index(search->summary, i);
char *uid = (char *)camel_message_info_uid(info); char *uid = (char *)camel_message_info_uid(info);
if (g_hash_table_lookup(results, uid)) { if (g_hash_table_lookup(results, uid)) {
@ -455,7 +464,7 @@
} else { } else {
g_warning("Search returned an invalid result type"); g_warning("Search returned an invalid result type");
} }
@@ -444,7 +441,7 @@ @@ -444,7 +441,7 @@ camel_folder_search_search(CamelFolderSe
GPtrArray *matches = NULL, *summary_set; GPtrArray *matches = NULL, *summary_set;
int i; int i;
GHashTable *results; GHashTable *results;
@ -464,7 +473,7 @@
struct _CamelFolderSearchPrivate *p = _PRIVATE(search); struct _CamelFolderSearchPrivate *p = _PRIVATE(search);
g_assert(search->folder); g_assert(search->folder);
@@ -496,12 +493,7 @@ @@ -496,12 +493,7 @@ camel_folder_search_search(CamelFolderSe
/* now create a folder summary to return?? */ /* now create a folder summary to return?? */
if (r->type == ESEXP_RES_ARRAY_PTR) { if (r->type == ESEXP_RES_ARRAY_PTR) {
d(printf("got result ...\n")); d(printf("got result ...\n"));
@ -478,7 +487,7 @@
/* reorder result in summary order */ /* reorder result in summary order */
results = g_hash_table_new(g_str_hash, g_str_equal); results = g_hash_table_new(g_str_hash, g_str_equal);
for (i=0;i<r->value.ptrarray->len;i++) { for (i=0;i<r->value.ptrarray->len;i++) {
@@ -513,14 +505,15 @@ @@ -513,14 +505,15 @@ camel_folder_search_search(CamelFolderSe
CamelMessageInfo *info = g_ptr_array_index(summary_set, i); CamelMessageInfo *info = g_ptr_array_index(summary_set, i);
char *uid = (char *)camel_message_info_uid(info); char *uid = (char *)camel_message_info_uid(info);
if (g_hash_table_lookup(results, uid)) if (g_hash_table_lookup(results, uid))
@ -499,7 +508,7 @@
} else { } else {
g_warning("Search returned an invalid result type"); g_warning("Search returned an invalid result type");
} }
@@ -553,12 +546,12 @@ @@ -553,12 +546,12 @@ void camel_folder_search_free_result(Cam
{ {
int i; int i;
struct _CamelFolderSearchPrivate *p = _PRIVATE(search); struct _CamelFolderSearchPrivate *p = _PRIVATE(search);

10
evolution-data-server-1.9.92-e-passwords.patch
View File

@ -1008,7 +1008,7 @@
} else { } else {
EUri *uri = e_uri_new (msg->key); EUri *uri = e_uri_new (msg->key);
@@ -683,287 +899,154 @@ ep_get_password_keyring (EPassMsg *msg) @@ -683,284 +899,154 @@ ep_get_password_keyring (EPassMsg *msg)
} }
} }
@ -1228,9 +1228,6 @@
+ if (data->remember || remember == E_PASSWORDS_REMEMBER_FOREVER) + if (data->remember || remember == E_PASSWORDS_REMEMBER_FOREVER)
+ ep_add_password (msg); + ep_add_password (msg);
-#if !GTK_CHECK_VERSION (2,4,0)
- gtk_dialog_set_has_separator(password_dialog, FALSE);
-#endif
- gtk_dialog_set_default_response(password_dialog, GTK_RESPONSE_OK); - gtk_dialog_set_default_response(password_dialog, GTK_RESPONSE_OK);
+ if (data->remember && remember == E_PASSWORDS_REMEMBER_FOREVER) + if (data->remember && remember == E_PASSWORDS_REMEMBER_FOREVER)
+ ep_remember_password (msg); + ep_remember_password (msg);
@ -1401,7 +1398,7 @@
} }
/** /**
@@ -986,151 +1070,138 @@ e_passwords_set_online(int state) @@ -986,150 +1070,137 @@ e_passwords_set_online(int state)
void void
e_passwords_forget_passwords (void) e_passwords_forget_passwords (void)
{ {
@ -1605,8 +1602,7 @@
+ * @component: component name of the caller + * @component: component name of the caller
+ * @key: key to store the password under, or NULL + * @key: key to store the password under, or NULL
* @prompt: prompt string * @prompt: prompt string
* @secret: whether or not the password text should be ***ed out * @type: whether or not to offer to remember the password,
* @remember_type: whether or not to offer to remember the password,
@@ -1146,241 +1217,44 @@ e_passwords_add_password (const char *ke @@ -1146,241 +1217,44 @@ e_passwords_add_password (const char *ke
* return value is non-%NULL and @remember_type is not * return value is non-%NULL and @remember_type is not
* E_PASSWORDS_DO_NOT_REMEMBER. * E_PASSWORDS_DO_NOT_REMEMBER.

33
evolution-data-server-1.9.92-isa-support.patch
View File

@ -1,33 +0,0 @@
--- evolution-data-server-1.9.92/servers/exchange/lib/e2k-context.c.isa-support 2007-01-03 09:56:24.000000000 -0500
+++ evolution-data-server-1.9.92/servers/exchange/lib/e2k-context.c 2007-03-09 14:05:48.000000000 -0500
@@ -603,6 +603,7 @@
g_free (suri->path);
suri->path = g_strdup (value);
action = soup_uri_to_string (suri, FALSE);
+ soup_uri_decode (action);
soup_uri_free (suri);
} else
action = g_strdup (value);
--- evolution-data-server-1.9.92/servers/exchange/lib/e2k-autoconfig.c.isa-support 2007-01-03 09:56:24.000000000 -0500
+++ evolution-data-server-1.9.92/servers/exchange/lib/e2k-autoconfig.c 2007-03-09 14:05:48.000000000 -0500
@@ -442,7 +442,9 @@
/* A redirection to "logon.asp" means this is Exchange 5.5
* OWA. A redirection to "owalogon.asp" means this is Exchange
- * 2003 forms-based authentication. Other redirections most
+ * 2003 forms-based authentication. A redirection to
+ * "CookieAuth.dll" means that it's an Exchange 2003 server
+ * behind an ISA Server 2004 proxy. Other redirections most
* likely indicate that the user's mailbox has been moved to a
* new server.
*/
@@ -460,7 +462,8 @@
if (strstr (location, "/logon.asp")) {
*result = E2K_AUTOCONFIG_EXCHANGE_5_5;
goto done;
- } else if (strstr (location, "/owalogon.asp")) {
+ } else if (strstr (location, "/owalogon.asp") ||
+ strstr (location, "/CookieAuth.dll")) {
if (e2k_context_fba (ctx, msg))
goto try_again;
*result = E2K_AUTOCONFIG_AUTH_ERROR;

22
evolution-data-server.spec
View File

@ -25,8 +25,8 @@
### Abstract ### ### Abstract ###
Name: evolution-data-server Name: evolution-data-server
Version: 1.11.2 Version: 1.11.3
Release: 3%{?dist} Release: 1%{?dist}
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
@ -57,9 +57,6 @@ Patch15: evolution-data-server-1.9.92-e-flag.patch
# GNOME bug #376991 # GNOME bug #376991
Patch16: evolution-data-server-1.9.92-e-passwords.patch Patch16: evolution-data-server-1.9.92-e-passwords.patch
# GNOME bug #415922
Patch17: evolution-data-server-1.9.92-isa-support.patch
# GNOME bug #417999 # GNOME bug #417999
Patch18: evolution-data-server-1.10.0-code-cleanup.patch Patch18: evolution-data-server-1.10.0-code-cleanup.patch
@ -69,9 +66,6 @@ Patch19: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
# RH bug #215634 # RH bug #215634
Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
# Fix the usual implicit function declarations
Patch21: evolution-data-server-1.11.2-implicit-function-declarations.patch
### Dependencies ### ### Dependencies ###
Requires: GConf2 Requires: GConf2
@ -158,11 +152,9 @@ evolution-data-server.
%patch14 -p1 -b .kill-ememory %patch14 -p1 -b .kill-ememory
%patch15 -p1 -b .e-flag %patch15 -p1 -b .e-flag
%patch16 -p1 -b .e-passwords %patch16 -p1 -b .e-passwords
%patch17 -p1 -b .isa-support
%patch18 -p1 -b .code-cleanup %patch18 -p1 -b .code-cleanup
%patch19 -p1 -b .camel-folder-symmary-crash %patch19 -p1 -b .camel-folder-symmary-crash
%patch20 -p1 -b .camel-certdb-nss-cert-get %patch20 -p1 -b .camel-certdb-nss-cert-get
%patch21 -p1 -b .implicit-function-declarations
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -387,13 +379,17 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog %changelog
* Thu May 31 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-3.fc7 * Mon Jun 04 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.3-1.fc8
- Update to 1.11.3
- Remove patch for GNOME bug #415922 (fixed upstream).
* Thu May 31 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-3.fc8
- Revise patch for GNOME bug #376991 to fix RH bug #241974. - Revise patch for GNOME bug #376991 to fix RH bug #241974.
* Mon May 21 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-2.fc7 * Mon May 21 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-2.fc8
- Store account passwords in GNOME Keyring. - Store account passwords in GNOME Keyring.
* Fri May 18 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-1.fc7 * Fri May 18 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.2-1.fc8
- Update to 1.11.2 - Update to 1.11.2
- Bump eds_base_version to 1.12. - Bump eds_base_version to 1.12.
- Add patch to fix implicit function declarations. - Add patch to fix implicit function declarations.

2
sources
View File

@ -1 +1 @@
69cc87c19f7178557902900eebd5de82 evolution-data-server-1.11.2.tar.bz2 5437a67b2ac574f1a50fa263a7c2026b evolution-data-server-1.11.3.tar.bz2