111 lines
3.6 KiB
Diff
111 lines
3.6 KiB
Diff
|
Index: calendar/backends/contacts/e-cal-backend-contacts.c
|
||
|
|
================================================================================
|
||
|
|
--- calendar/backends/contacts/e-cal-backend-contacts.c
|
||
|
|
+++ calendar/backends/contacts/e-cal-backend-contacts.c
|
||
|
|
@@ -384,7 +384,7 @@
|
||
|
|
static struct icaltimetype
|
||
|
|
cdate_to_icaltime (EContactDate *cdate)
|
||
|
|
{
|
||
|
|
- struct icaltimetype ret;
|
||
|
|
+ struct icaltimetype ret = icaltime_null_time();
|
||
|
|
|
||
|
|
/*FIXME: this is a really _ugly_ (temporary) hack
|
||
|
|
* since several functions are still depending on the epoch,
|
||
|
|
--- calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
|
||
|
|
+++ calendar/backends/groupwise/e-cal-backend-groupwise-utils.h
|
||
|
|
@@ -44,6 +44,7 @@
|
||
|
|
* Items management
|
||
|
|
*/
|
||
|
|
EGwItem *e_gw_item_new_from_cal_component (const char *container, ECalBackendGroupwise *cbgw, ECalComponent *comp);
|
||
|
|
+EGwItem *e_gw_item_new_for_delegate_from_cal (ECalBackendGroupwise *cbgw, ECalComponent *comp);
|
||
|
|
ECalComponent *e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw);
|
||
|
|
void e_gw_item_set_changes (EGwItem *item, EGwItem *cached_item);
|
||
|
|
|
||
|
|
--- camel/providers/groupwise/camel-groupwise-folder.c
|
||
|
|
+++ camel/providers/groupwise/camel-groupwise-folder.c
|
||
|
|
@@ -1866,7 +1866,7 @@
|
||
|
|
CamelGroupwiseStore *gw_store= CAMEL_GROUPWISE_STORE(folder->parent_store);
|
||
|
|
CamelGroupwiseStorePrivate *priv = gw_store->priv;
|
||
|
|
CamelOfflineStore *offline = (CamelOfflineStore *) folder->parent_store;
|
||
|
|
- EGwConnectionStatus status;
|
||
|
|
+ EGwConnectionStatus status = E_GW_CONNECTION_STATUS_OK;
|
||
|
|
EGwConnection *cnc;
|
||
|
|
EGwItem *item;
|
||
|
|
char *id;
|
||
|
|
--- camel/providers/imap/camel-imap-store.c
|
||
|
|
+++ camel/providers/imap/camel-imap-store.c
|
||
|
|
@@ -693,6 +693,9 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
#ifdef HAVE_SSL
|
||
|
|
+ /* as soon as we send a STARTTLS command, all hope is lost of a clean QUIT if problems arise */
|
||
|
|
+ clean_quit = FALSE;
|
||
|
|
+
|
||
|
|
if (!(store->capabilities & IMAP_CAPABILITY_STARTTLS)) {
|
||
|
|
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
|
||
|
|
_("Failed to connect to IMAP server %s in secure mode: %s"),
|
||
|
|
@@ -701,9 +704,6 @@
|
||
|
|
goto exception;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* as soon as we send a STARTTLS command, all hope is lost of a clean QUIT if problems arise */
|
||
|
|
- clean_quit = FALSE;
|
||
|
|
-
|
||
|
|
response = camel_imap_command (store, NULL, ex, "STARTTLS");
|
||
|
|
if (!response) {
|
||
|
|
camel_object_unref (store->istream);
|
||
|
|
--- camel/providers/pop3/camel-pop3-store.c
|
||
|
|
+++ camel/providers/pop3/camel-pop3-store.c
|
||
|
|
@@ -215,6 +215,9 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
#ifdef HAVE_SSL
|
||
|
|
+ /* as soon as we send a STLS command, all hope is lost of a clean QUIT if problems arise */
|
||
|
|
+ clean_quit = FALSE;
|
||
|
|
+
|
||
|
|
if (!(store->engine->capa & CAMEL_POP3_CAP_STLS)) {
|
||
|
|
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
|
||
|
|
_("Failed to connect to POP server %s in secure mode: %s"),
|
||
|
|
@@ -222,9 +225,6 @@
|
||
|
|
goto stls_exception;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* as soon as we send a STLS command, all hope is lost of a clean QUIT if problems arise */
|
||
|
|
- clean_quit = FALSE;
|
||
|
|
-
|
||
|
|
pc = camel_pop3_engine_command_new (store->engine, 0, NULL, NULL, "STLS\r\n");
|
||
|
|
while (camel_pop3_engine_iterate (store->engine, NULL) > 0)
|
||
|
|
;
|
||
|
|
--- libdb/dbm/dbm.c
|
||
|
|
+++ libdb/dbm/dbm.c
|
||
|
|
@@ -128,7 +128,8 @@
|
||
|
|
|
||
|
|
if (__cur_db == NULL) {
|
||
|
|
__db_no_open();
|
||
|
|
- item.dptr = 0;
|
||
|
|
+ item.dptr = NULL;
|
||
|
|
+ item.dsize = 0;
|
||
|
|
return (item);
|
||
|
|
}
|
||
|
|
return (dbm_fetch(__cur_db, key));
|
||
|
|
@@ -141,7 +142,8 @@
|
||
|
|
|
||
|
|
if (__cur_db == NULL) {
|
||
|
|
__db_no_open();
|
||
|
|
- item.dptr = 0;
|
||
|
|
+ item.dptr = NULL;
|
||
|
|
+ item.dsize = 0;
|
||
|
|
return (item);
|
||
|
|
}
|
||
|
|
return (dbm_firstkey(__cur_db));
|
||
|
|
@@ -157,7 +159,8 @@
|
||
|
|
|
||
|
|
if (__cur_db == NULL) {
|
||
|
|
__db_no_open();
|
||
|
|
- item.dptr = 0;
|
||
|
|
+ item.dptr = NULL;
|
||
|
|
+ item.dsize = 0;
|
||
|
|
return (item);
|
||
|
|
}
|
||
|
|
return (dbm_nextkey(__cur_db));
|