GNOME.org
 

evolution-data-server r9123 - in branches/camel-db-summary: . calendar calendar/backends/file camel camel/providers/groupwise camel/providers/imap camel/providers/nntp libedataserver libedataserverui po

Author: jjohnny
Date: Wed Jul 16 08:47:49 2008
New Revision: 9123
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9123&view=rev

Log:
Preparing for trunk merge


Modified:
   branches/camel-db-summary/ChangeLog
   branches/camel-db-summary/calendar/ChangeLog
   branches/camel-db-summary/calendar/backends/file/e-cal-backend-file.c
   branches/camel-db-summary/camel/ChangeLog
   branches/camel-db-summary/camel/camel-folder-search.c
   branches/camel-db-summary/camel/camel-folder-summary.c
   branches/camel-db-summary/camel/camel-folder.c
   branches/camel-db-summary/camel/camel-vee-folder.c
   branches/camel-db-summary/camel/camel-vee-store.c
   branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-folder.c
   branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-summary.c
   branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c
   branches/camel-db-summary/camel/providers/imap/camel-imap-utils.c
   branches/camel-db-summary/camel/providers/nntp/camel-nntp-folder.c
   branches/camel-db-summary/evolution-data-server-zip.in
   branches/camel-db-summary/libedataserver/e-categories.c
   branches/camel-db-summary/libedataserverui/ChangeLog
   branches/camel-db-summary/libedataserverui/e-book-auth-util.c
   branches/camel-db-summary/po/ChangeLog

Modified: branches/camel-db-summary/calendar/backends/file/e-cal-backend-file.c
==============================================================================
--- branches/camel-db-summary/calendar/backends/file/e-cal-backend-file.c	(original)
+++ branches/camel-db-summary/calendar/backends/file/e-cal-backend-file.c	Wed Jul 16 08:47:49 2008
@@ -1924,6 +1924,7 @@
 	ECalComponent *comp, *recurrence;
 	ECalBackendFileObject *obj_data;
 	struct icaltimetype current;
+	GList *detached = NULL;
 
 	cbfile = E_CAL_BACKEND_FILE (backend);
 	priv = cbfile->priv;
@@ -2137,10 +2138,39 @@
 		if (old_object)
 			*old_object = e_cal_component_get_as_string (obj_data->full_object);
 
+		if (obj_data->recurrences_list) {
+			/* has detached components, preserve them */
+			GList *l;
+
+			for (l = obj_data->recurrences_list; l; l = l->next) {
+				detached = g_list_prepend (detached, g_object_ref (l->data));
+			}
+		}
+
 		remove_component (cbfile, comp_uid, obj_data);
 
 		/* Add the new object */
 		add_component (cbfile, comp, TRUE);
+
+		if (detached) {
+			/* it had some detached components, place them back */
+			comp_uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (comp));
+
+			if ((obj_data = g_hash_table_lookup (priv->comp_uid_hash, comp_uid)) != NULL) {
+				GList *l;
+
+				for (l = detached; l; l = l->next) {
+					ECalComponent *c = l->data;
+
+					g_hash_table_insert (obj_data->recurrences, e_cal_component_get_recurid_as_string (c), c);
+					icalcomponent_add_component (priv->icalcomp, e_cal_component_get_icalcomponent (c));
+					priv->comp = g_list_append (priv->comp, c);
+					obj_data->recurrences_list = g_list_append (obj_data->recurrences_list, c);
+				}
+			}
+
+			g_list_free (detached);
+		}
 		break;
 	}
 

Modified: branches/camel-db-summary/camel/camel-folder-search.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-search.c	(original)
+++ branches/camel-db-summary/camel/camel-folder-search.c	Wed Jul 16 08:47:49 2008
@@ -1364,7 +1364,7 @@
 		gboolean truth = FALSE;
 		
 		if (argc == 1) 
-				truth = camel_system_flag_get (camel_message_info_flags(search->current), argv[0]->value.string);
+			truth = camel_system_flag_get (camel_message_info_flags(search->current), argv[0]->value.string);
 		
 		r = e_sexp_result_new(f, ESEXP_RES_BOOL);
 		r->value.bool = truth;

Modified: branches/camel-db-summary/camel/camel-folder-summary.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-summary.c	(original)
+++ branches/camel-db-summary/camel/camel-folder-summary.c	Wed Jul 16 08:47:49 2008
@@ -33,9 +33,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#define _XOPEN_SOURCE
-#include <time.h>
-
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n-lib.h>
@@ -447,7 +444,7 @@
 {
 	GPtrArray *res = g_ptr_array_new();
 	int i;
-
+	
 	CAMEL_SUMMARY_LOCK(s, summary_lock);
 
 	g_ptr_array_set_size(res, s->uids->len);
@@ -460,7 +457,6 @@
 	return res;
 }
 
-
 struct _db_pass_data {
 	CamelFolderSummary *summary;
 	gboolean double_ref;
@@ -3732,7 +3728,7 @@
 } flag_names[] = {
 	{ "answered", CAMEL_MESSAGE_ANSWERED },
 	{ "deleted", CAMEL_MESSAGE_DELETED },
-	{ "draft", CAMEL_MESSAGE_DELETED },
+	{ "draft", CAMEL_MESSAGE_DRAFT },
 	{ "flagged", CAMEL_MESSAGE_FLAGGED },
 	{ "seen", CAMEL_MESSAGE_SEEN },
 	{ "attachments", CAMEL_MESSAGE_ATTACHMENTS },

Modified: branches/camel-db-summary/camel/camel-folder.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder.c	(original)
+++ branches/camel-db-summary/camel/camel-folder.c	Wed Jul 16 08:47:49 2008
@@ -207,7 +207,7 @@
 		camel_db_close (camel_folder->cdb);
 		camel_folder->cdb = NULL;
 	}
-	
+
 	g_static_rec_mutex_free(&p->lock);
 	g_static_mutex_free(&p->change_lock);
 	
@@ -332,10 +332,10 @@
 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
 
 	CAMEL_FOLDER_REC_LOCK(folder, lock);
-	
+
 	CF_CLASS (folder)->refresh_info (folder, ex);
 	
-	CAMEL_FOLDER_REC_UNLOCK(folder, lock);	
+	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
 }
 
 static int
@@ -1461,9 +1461,9 @@
 {
 	CamelMimeMessage *msg;
 	CamelMessageInfo *minfo, *info;
-
+	
 	/* Default implementation. */
-
+	
 	msg = camel_folder_get_message(source, uid, ex);
 	if (!msg)
 		return;
@@ -1475,16 +1475,16 @@
 		camel_folder_free_message_info(source, minfo);
 	} else
 		info = camel_message_info_new_from_header(NULL, ((CamelMimePart *)msg)->headers);
-
+	
 	/* we don't want to retain the deleted flag */
 	camel_message_info_set_flags(info, CAMEL_MESSAGE_DELETED, 0);
-
+	
 	camel_folder_append_message (dest, msg, info, transferred_uid, ex);
 	camel_object_unref (msg);
-
+	
 	if (delete_original && !camel_exception_is_set (ex))
 		camel_folder_set_message_flags (source, uid, CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0);
-
+	
 	camel_message_info_free (info);
 }
 

Modified: branches/camel-db-summary/camel/camel-vee-folder.c
==============================================================================
--- branches/camel-db-summary/camel/camel-vee-folder.c	(original)
+++ branches/camel-db-summary/camel/camel-vee-folder.c	Wed Jul 16 08:47:49 2008
@@ -576,8 +576,6 @@
 	GHashTable *searched = g_hash_table_new(NULL, NULL);
 	CamelVeeFolder *folder_unmatched = vf->parent_vee_store ? vf->parent_vee_store->folder_unmatched : NULL;
 	
-
-	
 	if (vf != folder_unmatched)
 		expr = g_strdup_printf ("(and %s %s)", vf->expression ? vf->expression : "", expression);
 	else

Modified: branches/camel-db-summary/camel/camel-vee-store.c
==============================================================================
--- branches/camel-db-summary/camel/camel-vee-store.c	(original)
+++ branches/camel-db-summary/camel/camel-vee-store.c	Wed Jul 16 08:47:49 2008
@@ -97,8 +97,6 @@
 
 	/* we dont want a vtrash/vjunk on this one */
 	store->flags &= ~(CAMEL_STORE_VTRASH | CAMEL_STORE_VJUNK);	
-
-
 }
 
 static void

Modified: branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-folder.c
==============================================================================
--- branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-folder.c	(original)
+++ branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-folder.c	Wed Jul 16 08:47:49 2008
@@ -1971,6 +1971,7 @@
 	GList *temp;
 	CamelFolderChangeInfo *changes = NULL;
 	char *uid;
+
 	changes = camel_folder_change_info_new ();
 
 	item_list = g_list_reverse (item_list);

Modified: branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-summary.c
==============================================================================
--- branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-summary.c	(original)
+++ branches/camel-db-summary/camel/providers/groupwise/camel-groupwise-summary.c	Wed Jul 16 08:47:49 2008
@@ -63,7 +63,6 @@
 static int content_info_to_db (CamelFolderSummary *s, CamelMessageContentInfo *info, CamelMIRecord *mir);
 static CamelMessageContentInfo * content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir);
 
-
 static void camel_groupwise_summary_class_init (CamelGroupwiseSummaryClass *klass);
 static void camel_groupwise_summary_init       (CamelGroupwiseSummary *obj);
 

Modified: branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c	(original)
+++ branches/camel-db-summary/camel/providers/imap/camel-imap-folder.c	Wed Jul 16 08:47:49 2008
@@ -926,9 +926,12 @@
 			continue; 
 
 		info = camel_folder_summary_uid (folder->summary, uid);
+
 		iinfo = (CamelImapMessageInfo *)info;
+
 		if (strcmp (uid, new[i].uid) != 0) {
 			g_free (uid);
+
 			seq = i + 1;
 			g_array_append_val (removed, seq);
 			i--;
@@ -1161,6 +1164,7 @@
 	CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
 	CamelImapMessageInfo *info;
 	CamelException local_ex;
+
 	GPtrArray *matches, *summary;
 	char *set, *flaglist, *uid;
 	int i, j, max;
@@ -3180,11 +3184,6 @@
 			camel_folder_change_info_recent_uid (changes, camel_message_info_uid (mi));
 	}
 
-/* 	for ( ; i < messages->len; i++) { */
-/* 		if ((mi = messages->pdata[i])) */
-/* 			camel_message_info_free(&mi->info); */
-/* 	} */
-	
 	g_ptr_array_free (messages, TRUE);
 	
 	return;
@@ -3217,7 +3216,7 @@
 	CamelMessageInfo *info;
 	int len;
 	char *uid;
-	
+
 	changes = camel_folder_change_info_new ();
 	if (expunged) {
 		int i, id;

Modified: branches/camel-db-summary/camel/providers/imap/camel-imap-utils.c
==============================================================================
--- branches/camel-db-summary/camel/providers/imap/camel-imap-utils.c	(original)
+++ branches/camel-db-summary/camel/providers/imap/camel-imap-utils.c	Wed Jul 16 08:47:49 2008
@@ -1184,6 +1184,7 @@
 	suid = camel_folder_summary_uid_from_index (summary, index);
 	uid = strtoul (suid, NULL, 10);
 	g_free (suid);
+
 	return uid;
 }
 

Modified: branches/camel-db-summary/camel/providers/nntp/camel-nntp-folder.c
==============================================================================
--- branches/camel-db-summary/camel/providers/nntp/camel-nntp-folder.c	(original)
+++ branches/camel-db-summary/camel/providers/nntp/camel-nntp-folder.c	Wed Jul 16 08:47:49 2008
@@ -419,6 +419,7 @@
 nntp_folder_finalise (CamelNNTPFolder *nntp_folder)
 {
 	struct _CamelNNTPFolderPrivate *p;
+
 	CamelException ex;
 
 	camel_exception_init (&ex);
@@ -515,6 +516,7 @@
 	root = g_strdup_printf("%s.ev-summary", nntp_folder->storage_path);
 	folder->summary = (CamelFolderSummary *) camel_nntp_summary_new (folder, root);
 	g_free(root);
+
 	camel_folder_summary_load_from_db (folder->summary, ex);
 	
 	si = camel_store_summary_path ((CamelStoreSummary *) ((CamelNNTPStore*) parent)->summary, folder_name);

Modified: branches/camel-db-summary/evolution-data-server-zip.in
==============================================================================
--- branches/camel-db-summary/evolution-data-server-zip.in	(original)
+++ branches/camel-db-summary/evolution-data-server-zip.in	Wed Jul 16 08:47:49 2008
@@ -66,9 +66,9 @@
 share/evolution-data-server- BASE_VERSION@/weather/Locations.xml
 EOF
 
-zip -r $ZIP share/evolution-data-server- BASE_VERSION@/zoneinfo
+zip -r -D $ZIP share/evolution-data-server- BASE_VERSION@/zoneinfo
 
-zip -r $ZIP share/pixmaps/evolution-data-server- BASE_VERSION@
+zip -r -D $ZIP share/pixmaps/evolution-data-server
 
 if [ -f share/locale/de/LC_MESSAGES/evolution-data-server- BASE_VERSION@.mo ]; then
   zip $ZIP share/locale/*/LC_MESSAGES/evolution-data-server- BASE_VERSION@.mo
@@ -77,7 +77,7 @@
 fi
 
 rm $DEVZIP
-zip -r $DEVZIP -@ <<EOF
+zip -r -D $DEVZIP -@ <<EOF
 lib/libcamel-1.2.dll.a
 lib/libcamel-provider-1.2.dll.a
 lib/libebook-1.2.dll.a

Modified: branches/camel-db-summary/libedataserver/e-categories.c
==============================================================================
--- branches/camel-db-summary/libedataserver/e-categories.c	(original)
+++ branches/camel-db-summary/libedataserver/e-categories.c	Wed Jul 16 08:47:49 2008
@@ -57,6 +57,7 @@
 	{ N_("Miscellaneous"), "category_miscellaneous_16.png" },
 	{ N_("Personal"), "category_personal_16.png" },
 	{ N_("Phone Calls"), "category_phonecalls_16.png" },
+	/* Translators: "Status" is a category name; it can mean anything user wants to */
 	{ N_("Status"), "category_status_16.png" },
 	{ N_("Strategies"), "category_strategies_16.png" },
 	{ N_("Suppliers"), "category_suppliers_16.png" },

Modified: branches/camel-db-summary/libedataserverui/e-book-auth-util.c
==============================================================================
--- branches/camel-db-summary/libedataserverui/e-book-auth-util.c	(original)
+++ branches/camel-db-summary/libedataserverui/e-book-auth-util.c	Wed Jul 16 08:47:49 2008
@@ -72,9 +72,10 @@
 {
 	LoadSourceData *data = closure;
 
-	if (status != E_BOOK_ERROR_OK) {
+	switch (status) {
+
 		/* the user clicked cancel in the password dialog */
-		if (status == E_BOOK_ERROR_CANCELLED) {
+		case E_BOOK_ERROR_CANCELLED:
 			if (e_book_check_static_capability (book, "anon-access")) {
 				GtkWidget *dialog;
 
@@ -89,21 +90,16 @@
 								 _("Accessing LDAP Server anonymously"));
 				g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
 				gtk_widget_show (dialog);
-				if (data->open_func)
-					data->open_func (book, E_BOOK_ERROR_OK, data->open_func_data);
-				free_load_source_data (data);
-				return;
 			}
-		} else if (status == E_BOOK_ERROR_INVALID_SERVER_VERSION) {
-#if 0
-			e_error_run (NULL, "addressbook:server-version", NULL);
-#endif
+			break;
+
+		case E_BOOK_ERROR_INVALID_SERVER_VERSION:
 			status = E_BOOK_ERROR_OK;
-			if (data->open_func)
-				data->open_func (book, status, data->open_func_data);
-			free_load_source_data (data);
-			return;
-		} else {
+			break;
+
+		case E_BOOK_ERROR_AUTHENTICATION_FAILED:
+		case E_BOOK_ERROR_AUTHENTICATION_REQUIRED:
+		{
 			const gchar *uri = e_book_get_uri (book);
 			gchar *stripped_uri = remove_parameters_from_uri (uri);
 			const gchar *auth_domain = e_source_get_property (data->source, "auth-domain");
@@ -120,6 +116,9 @@
 
 			return;
 		}
+
+		default:
+			break;
 	}
 
 	if (data->open_func)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]