diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c b/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c new file mode 100644 index 000000000000..2f3d3d6ff5bb --- /dev/null +++ b/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c @@ -0,0 +1,47 @@ +--- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig Fri Sep 2 16:37:43 2005 ++++ addressbook/backends/groupwise/e-book-backend-groupwise.c Thu Nov 10 09:55:01 2005 +@@ -2010,6 +2010,7 @@ + if (enable_debug) + printf ("\nread contacts from cache for the ids found in summary\n"); + for (i = 0; i < ids->len; i ++) { ++ EContact *contact; + char *uid = g_ptr_array_index (ids, i); + + g_mutex_lock (closure->mutex); +@@ -2019,8 +2020,7 @@ + if (stopped) + break; + +- EContact *contact = +- e_book_backend_cache_get_contact (priv->cache, uid); ++ contact = e_book_backend_cache_get_contact (priv->cache, uid); + e_data_book_view_notify_update (book_view, contact); + g_object_unref (contact); + } +@@ -2697,6 +2697,13 @@ + EBookBackendGroupwisePrivate *priv = ebgw->priv; + EBookBackendCache *cache = priv->cache; + ++ struct timeval start, end; ++ unsigned long diff; ++ const char *cache_file_name; ++ struct stat buf; ++ time_t mod_time; ++ ++ + if (enable_debug) + printf("\nupdating GroupWise system address book cache \n"); + +@@ -2741,12 +2748,6 @@ + server_last_sequence, server_last_po_rebuild_time); + return TRUE; + } +- +- struct timeval start, end; +- unsigned long diff; +- const char *cache_file_name; +- struct stat buf; +- time_t mod_time; + + if (enable_debug) + gettimeofday(&start, NULL); diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c index 51f468867330..c8262746ec0f 100644 --- a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c +++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c @@ -11,3 +11,55 @@ E_STRING_PROP (E_CONTACT_SPOUSE, "spouseName"), E_STRING_PROP (E_CONTACT_NOTE, "note"), E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), +@@ -1698,8 +1698,9 @@ + + msg_type = ldap_msgtype (res); + if (msg_type == LDAP_RES_SEARCH_ENTRY) { ++ LDAPMessage *e; + g_static_rec_mutex_lock (&eds_ldap_handler_lock); +- LDAPMessage *e = ldap_first_entry(ldap, res); ++ e = ldap_first_entry(ldap, res); + g_static_rec_mutex_unlock (&eds_ldap_handler_lock); + + if (!e) { +@@ -1908,13 +1909,14 @@ + the op after either */ + msg_type = ldap_msgtype (res); + if (msg_type == LDAP_RES_SEARCH_ENTRY) { +- g_static_rec_mutex_lock (&eds_ldap_handler_lock); +- LDAPMessage *e = ldap_first_entry (bl->priv->ldap, res); +- g_static_rec_mutex_unlock (&eds_ldap_handler_lock); +- + EContact *contact; + char *vcard; + ++ LDAPMessage *e; ++ g_static_rec_mutex_lock (&eds_ldap_handler_lock); ++ e = ldap_first_entry (bl->priv->ldap, res); ++ g_static_rec_mutex_unlock (&eds_ldap_handler_lock); ++ + if (!e) { + g_warning ("uh, this shouldn't happen"); + e_data_book_respond_get_contact (op->book, +@@ -3470,8 +3472,9 @@ + g_static_rec_mutex_unlock (&eds_ldap_handler_lock); + + while (NULL != e) { ++ EContact *contact; + g_static_rec_mutex_lock (&eds_ldap_handler_lock); +- EContact *contact = build_contact_from_entry (ldap, e, NULL); ++ contact = build_contact_from_entry (ldap, e, NULL); + g_static_rec_mutex_unlock (&eds_ldap_handler_lock); + + e_data_book_view_notify_update (view, contact); +@@ -3709,8 +3712,9 @@ + g_static_rec_mutex_unlock (&eds_ldap_handler_lock); + + while (e != NULL) { ++ EContact *contact; + g_static_rec_mutex_lock (&eds_ldap_handler_lock); +- EContact *contact = build_contact_from_entry (ldap, e, NULL); ++ contact = build_contact_from_entry (ldap, e, NULL); + g_static_rec_mutex_unlock (&eds_ldap_handler_lock); + + contact_list_op->contacts = g_list_prepend (contact_list_op->contacts, contact); diff --git a/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c new file mode 100644 index 000000000000..1f3e165afca9 --- /dev/null +++ b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c @@ -0,0 +1,16 @@ +--- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig Mon Oct 3 11:05:43 2005 ++++ calendar/backends/groupwise/e-cal-backend-groupwise.c Thu Nov 10 10:09:35 2005 +@@ -322,11 +322,12 @@ + + for (; item_list != NULL; item_list = g_list_next(item_list)) { + EGwItem *item = NULL; +- item = E_GW_ITEM(item_list->data); + ECalComponent *modified_comp = NULL, *cache_comp = NULL; + char *cache_comp_str = NULL; + const char *uid, *rid = NULL; + int r_key; ++ ++ item = E_GW_ITEM(item_list->data); + + modified_comp = e_gw_item_to_cal_component (item, cbgw); + if (!modified_comp) { diff --git a/databases/evolution-data-server/files/patch-camel-groupwise-folder.c b/databases/evolution-data-server/files/patch-camel-groupwise-folder.c new file mode 100644 index 000000000000..52e4ec88d080 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel-groupwise-folder.c @@ -0,0 +1,30 @@ +--- camel/providers/groupwise/camel-groupwise-folder.c.orig Mon Oct 3 14:10:05 2005 ++++ camel/providers/groupwise/camel-groupwise-folder.c Thu Nov 10 05:26:17 2005 +@@ -1032,9 +1032,9 @@ + char *temp_date = NULL; + const char *id; + GSList *recp_list = NULL; +- status_flags = 0; + CamelStream *cache_stream; + CamelMimeMessage *mail_msg = NULL; ++ status_flags = 0; + + id = e_gw_item_get_id (temp_item); + +@@ -1768,6 +1768,7 @@ + const char *old_uid = (const char*)uids->pdata[index]; + char **tmp; + guint32 temp_flags = 0; ++ CamelGroupwiseMessageInfo *dest_info; + CamelGroupwiseMessageInfo *src_info = (CamelGroupwiseMessageInfo *)camel_folder_summary_uid (source->summary, (const char*)uids->pdata[index]); + + /* we don't want to blindly copy the info: reset some flags not suitable for destination*/ +@@ -1776,7 +1777,7 @@ + else if (!strcmp(destination->full_name, JUNK_FOLDER)) + camel_folder_set_message_flags (source, old_uid, CAMEL_MESSAGE_JUNK, CAMEL_GW_MESSAGE_JUNK); + +- CamelGroupwiseMessageInfo *dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info); ++ dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info); + tmp = g_strsplit (old_uid, ":", -1); + dest_info->info.uid = g_strdup_printf ("%s:%s",tmp[0], dest_container_id); + temp_flags = camel_folder_get_message_flags (source, (const char *)uids->pdata[index]); diff --git a/databases/evolution-data-server/files/patch-camel-groupwise-utils.c b/databases/evolution-data-server/files/patch-camel-groupwise-utils.c new file mode 100644 index 000000000000..5478bec69c84 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel-groupwise-utils.c @@ -0,0 +1,25 @@ +--- camel/providers/groupwise/camel-groupwise-utils.c.orig Mon Oct 3 11:05:45 2005 ++++ camel/providers/groupwise/camel-groupwise-utils.c Thu Nov 10 05:36:51 2005 +@@ -339,8 +339,9 @@ + attachment->name = g_strdup (filename ? filename : ""); + if (!g_ascii_strncasecmp (attachment->contentType, RFC_822, strlen (RFC_822))) { + char *temp_id = NULL, *id = NULL; ++ int len; + temp_id = (char *)camel_medium_get_header (CAMEL_MEDIUM ((CamelMimeMessage *)dw), "Message-Id"); +- int len = strlen (temp_id); ++ len = strlen (temp_id); + + id = (char *)g_malloc0 (len-1); + id = memcpy(id, temp_id+2, len-3); +@@ -430,9 +431,10 @@ + dw = camel_medium_get_content_object (CAMEL_MEDIUM (part)); + if (type->subtype && !strcmp (type->subtype, "alternative")) { + CamelMimePart *temp_part; ++ CamelDataWrapper *temp_dw; + CamelStreamMem *temp_content = (CamelStreamMem *)camel_stream_mem_new (); + temp_part = camel_multipart_get_part ((CamelMultipart *)dw, 1); +- CamelDataWrapper *temp_dw = camel_data_wrapper_new (); ++ temp_dw = camel_data_wrapper_new (); + if (temp_part) { + is_alternative = TRUE; + temp_dw = camel_medium_get_content_object (CAMEL_MEDIUM (temp_part)); diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c b/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c new file mode 100644 index 000000000000..19b5c0581307 --- /dev/null +++ b/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c @@ -0,0 +1,11 @@ +--- libedataserverui/e-name-selector-entry.c.orig Mon Oct 3 11:05:48 2005 ++++ libedataserverui/e-name-selector-entry.c Thu Nov 10 10:23:46 2005 +@@ -1112,7 +1112,7 @@ + const gchar *text; + gint index_start, index_end; + gint selection_start, selection_end; +- gunichar str_context [2], str_b_context [2];; ++ gunichar str_context [2], str_b_context [2]; + gint len; + gint i; + gboolean already_selected = FALSE; diff --git a/databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c b/databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c new file mode 100644 index 000000000000..e366b774de97 --- /dev/null +++ b/databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c @@ -0,0 +1,17 @@ +--- servers/exchange/storage/e-folder-exchange.c.orig Mon Oct 3 11:05:51 2005 ++++ servers/exchange/storage/e-folder-exchange.c Thu Nov 10 05:04:23 2005 +@@ -744,11 +744,13 @@ + void + e_folder_exchange_unsubscribe (EFolder *folder) + { ++ E2kContext *ctx; ++ + g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder)); + + /* FIXME : This is a hack as of now. The free_folder in mail-stub + gets called when we are in offline and the context is NULL then. */ +- E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); ++ ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); + if (ctx) { + e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder), + E_FOLDER_EXCHANGE_URI (folder)); diff --git a/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c b/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c new file mode 100644 index 000000000000..faa3ce120218 --- /dev/null +++ b/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c @@ -0,0 +1,12 @@ +--- servers/groupwise/e-gw-connection.c.orig Mon Oct 3 11:05:51 2005 ++++ servers/groupwise/e-gw-connection.c Thu Nov 10 00:32:44 2005 +@@ -1979,8 +1979,8 @@ + EGwConnectionPrivate *priv; + SoupSoapParameter *param, *subparam, *second_level_child; + char *id, *name; +- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); + static GStaticMutex connecting = G_STATIC_MUTEX_INIT; ++ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); + + priv = cnc->priv; + g_static_mutex_lock (&connecting); diff --git a/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-item.c b/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-item.c new file mode 100644 index 000000000000..89201b2e7cb5 --- /dev/null +++ b/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-item.c @@ -0,0 +1,12 @@ +--- servers/groupwise/e-gw-item.c.orig Mon Oct 3 14:46:42 2005 ++++ servers/groupwise/e-gw-item.c Thu Nov 10 04:56:48 2005 +@@ -3019,8 +3019,8 @@ + + /*attachments*/ + if (priv->attach_list) { +- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + GSList *al ; ++ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + for (al = priv->attach_list ; al != NULL ; al = al->next) { + EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; + add_attachment_to_soap_message (attachment, msg) ;