- Bump eds_base_version to 2.22. - Remove patch for RH bug #212106 (fixed upstream). - Remove patch for GNOME bug #417999 (fixed upstream).f41
Matthew Barnes
18 years ago
parent
974bb037b7
commit
a188ce3308
@ -1 +1 @@
|
||||
evolution-data-server-1.12.1.tar.bz2
|
||||
evolution-data-server-2.21.1.tar.bz2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,56 +0,0 @@
|
||||
diff -up evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c.db4 evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c
|
||||
--- evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c.db4 2007-10-12 02:29:47.000000000 -0400
|
||||
+++ evolution-data-server-1.12.1/addressbook/backends/file/e-book-backend-file.c 2007-10-19 11:56:03.000000000 -0400
|
||||
@@ -1137,23 +1137,30 @@ e_book_backend_file_load_source (EBookBa
|
||||
return db_error_to_status (db_error);
|
||||
}
|
||||
|
||||
+ db->close (db, 0);
|
||||
+ db_error = db_create (&db, env, 0);
|
||||
+ if (db_error != 0) {
|
||||
+ g_warning ("db_create failed with %s", db_strerror (db_error));
|
||||
+ g_free (dirname);
|
||||
+ g_free (filename);
|
||||
+ return db_error_to_status (db_error);
|
||||
+ }
|
||||
+
|
||||
db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
|
||||
}
|
||||
|
||||
- bf->priv->file_db = db;
|
||||
-
|
||||
if (db_error == 0) {
|
||||
writable = TRUE;
|
||||
} else {
|
||||
db->close (db, 0);
|
||||
-
|
||||
db_error = db_create (&db, env, 0);
|
||||
if (db_error != 0) {
|
||||
g_warning ("db_create failed with %s", db_strerror (db_error));
|
||||
g_free (dirname);
|
||||
g_free (filename);
|
||||
- return GNOME_Evolution_Addressbook_OtherError;
|
||||
+ return db_error_to_status (db_error);
|
||||
}
|
||||
+
|
||||
db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666);
|
||||
|
||||
if (db_error != 0 && !only_if_exists) {
|
||||
@@ -1178,7 +1185,7 @@ e_book_backend_file_load_source (EBookBa
|
||||
g_warning ("db_create failed with %s", db_strerror (db_error));
|
||||
g_free (dirname);
|
||||
g_free (filename);
|
||||
- return GNOME_Evolution_Addressbook_OtherError;
|
||||
+ return db_error_to_status (db_error);
|
||||
}
|
||||
|
||||
db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
|
||||
@@ -1201,6 +1208,8 @@ e_book_backend_file_load_source (EBookBa
|
||||
}
|
||||
}
|
||||
|
||||
+ bf->priv->file_db = db;
|
||||
+
|
||||
if (db_error != 0) {
|
||||
bf->priv->file_db = NULL;
|
||||
g_free (dirname);
|
||||
@ -0,0 +1,77 @@
|
||||
diff -up evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c.implicit-function-declarations evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c
|
||||
--- evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c.implicit-function-declarations 2007-10-24 02:39:44.000000000 -0400
|
||||
+++ evolution-data-server-2.21.1/servers/google/libgdata/gdata-entry.c 2007-10-29 11:14:13.000000000 -0400
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <libxml/xpath.h>
|
||||
#include <libxml/xpathInternals.h>
|
||||
|
||||
+#include <string.h>
|
||||
#include <gdata-entry.h>
|
||||
|
||||
#define GDATA_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_ENTRY, GDataEntryPrivate))
|
||||
@@ -812,7 +813,7 @@ build_hash_table_entries (gchar *key, gc
|
||||
|
||||
if (ptr->next == NULL) {
|
||||
/* FIXME: Will we be needing , these nodes of entries when building them ? */
|
||||
- if (!g_strcasecmp (key, "published") || !g_strcasecmp (key, "id") || !g_strcasecmp (key, "updated"))
|
||||
+ if (!g_ascii_strcasecmp (key, "published") || !g_ascii_strcasecmp (key, "id") || !g_ascii_strcasecmp (key, "updated"))
|
||||
break;
|
||||
|
||||
ptr->next = xmlNewNode (NULL, (xmlChar *)key);
|
||||
@@ -1081,7 +1082,7 @@ gdata_entry_get_edit_link (GDataEntry *e
|
||||
|
||||
while (list) {
|
||||
link = list->data;
|
||||
- if (!g_strcasecmp (link->rel, "edit")) {
|
||||
+ if (!g_ascii_strcasecmp (link->rel, "edit")) {
|
||||
edit_link = g_strdup(link->href);
|
||||
}
|
||||
list = g_slist_next (list);
|
||||
diff -up evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c.implicit-function-declarations evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c
|
||||
--- evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c.implicit-function-declarations 2007-10-29 11:17:57.000000000 -0400
|
||||
+++ evolution-data-server-2.21.1/servers/google/libgdata-google/gdata-google-service.c 2007-10-29 11:18:19.000000000 -0400
|
||||
@@ -183,7 +183,7 @@ gdata_google_service_get_feed (GDataServ
|
||||
|
||||
if (!service_is_authenticated( GDATA_GOOGLE_SERVICE(service) )) {
|
||||
status = service_authenticate(GDATA_GOOGLE_SERVICE(service));
|
||||
- if (g_strcasecmp(status, "SUCCESS")) {
|
||||
+ if (g_ascii_strcasecmp(status, "SUCCESS")) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
@@ -235,7 +235,7 @@ gdata_google_service_insert_entry (GData
|
||||
if (!service_is_authenticated(GDATA_GOOGLE_SERVICE(service))) {
|
||||
status = service_authenticate(GDATA_GOOGLE_SERVICE(service));
|
||||
|
||||
- if (g_strcasecmp(status,"SUCCESS"))
|
||||
+ if (g_ascii_strcasecmp(status,"SUCCESS"))
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -305,7 +305,7 @@ gdata_google_service_delete_entry (GData
|
||||
|
||||
if (!service_is_authenticated (GDATA_GOOGLE_SERVICE(service))) {
|
||||
status = (xmlChar *)service_authenticate (GDATA_GOOGLE_SERVICE(service));
|
||||
- if (g_strcasecmp((gchar *)status, "SUCCESS"))
|
||||
+ if (g_ascii_strcasecmp((gchar *)status, "SUCCESS"))
|
||||
return ;
|
||||
}
|
||||
|
||||
@@ -350,7 +350,7 @@ gdata_google_service_update_entry (GData
|
||||
|
||||
if (!service_is_authenticated (GDATA_GOOGLE_SERVICE (service))) {
|
||||
status = service_authenticate (GDATA_GOOGLE_SERVICE (service));
|
||||
- if (g_strcasecmp (status, "SUCCESS"))
|
||||
+ if (g_ascii_strcasecmp (status, "SUCCESS"))
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -410,7 +410,7 @@ gdata_google_service_update_entry_with_l
|
||||
|
||||
if (!service_is_authenticated (GDATA_GOOGLE_SERVICE(service))) {
|
||||
status = service_authenticate (GDATA_GOOGLE_SERVICE(service));
|
||||
- if (g_strcasecmp (status, "SUCCESS"))
|
||||
+ if (g_ascii_strcasecmp (status, "SUCCESS"))
|
||||
return;
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue