GNOME.org
 

evolution-data-server r8902 - in branches/camel-db-summary: . calendar calendar/libecal camel camel/providers/imap camel/providers/local docs/reference/camel/tmpl libedataserver servers/groupwise

Author: sragavan
Date: Tue Jun  3 03:40:35 2008
New Revision: 8902
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8902&view=rev

Log:
Merge branch 'master' into disk-summary


Modified:
   branches/camel-db-summary/ChangeLog
   branches/camel-db-summary/NEWS
   branches/camel-db-summary/calendar/ChangeLog
   branches/camel-db-summary/calendar/libecal/e-cal-component.c
   branches/camel-db-summary/camel/ChangeLog
   branches/camel-db-summary/camel/camel-folder-summary.h
   branches/camel-db-summary/camel/camel-mime-utils.c
   branches/camel-db-summary/camel/providers/imap/ChangeLog
   branches/camel-db-summary/camel/providers/imap/camel-imap-command.c
   branches/camel-db-summary/camel/providers/imap/camel-imap-store-summary.c
   branches/camel-db-summary/camel/providers/local/ChangeLog
   branches/camel-db-summary/camel/providers/local/camel-maildir-store.c
   branches/camel-db-summary/configure.in
   branches/camel-db-summary/docs/reference/camel/tmpl/camel-folder-summary.sgml
   branches/camel-db-summary/libedataserver/e-data-server-util.c
   branches/camel-db-summary/servers/groupwise/ChangeLog
   branches/camel-db-summary/servers/groupwise/e-gw-connection.c

Modified: branches/camel-db-summary/NEWS
==============================================================================
--- branches/camel-db-summary/NEWS	(original)
+++ branches/camel-db-summary/NEWS	Tue Jun  3 03:40:35 2008
@@ -1,3 +1,43 @@
+Evolution-Data-Server 2.23.3 2008-06-02
+----------------------------------------
+
+New in 2.23.3:
+	Implement support for getting and setting IMAP4 cache's expire settings (Jeffrey Stedfast)
+
+Bug Fixes:
+	#318803: Do not show ".#evolution" directory in the UI (Ilkka Tuohela)
+	#326149: Set inbox flag only on real inboxes (Milan Crha)
+	#354923: Store passwords in the keyring by server, username and protocol (Matthew Barnes)
+	#374616: Return proper IMAP error (Milan Crha)
+	#388579: (Novell Bugzilla) Fix for Exchange crasher (Chenthill Palanisamy)
+	#473658: Fix a crash when starting evolution (Milan Crha)
+	#518312: Work around the broken "Jive Forums" NNTP gateway (Jeffrey Stedfast)
+	#530514: Added a necessary condition to handle a specific server response and to prevent a crash (Sankar P)
+	#530543: Large memory leak while syncing mails for offline usage (Sankar P)
+	#530763: Return NULL if the value of dest_folder is disturbed to prevent the crash (Bharath Acharya)
+	#531009: Use the right iterator to prevent a crash in offline mail movement (Sankar P)
+	#531439: Prevent GPG passphrases from destroying other passwords (Matthew Barnes)
+	#531591: Don't use TeX-style quotes in user-visible messages (Matthew Barnes)
+	#531713: Split the evolution-data-server version into major/minor/micro macros (Matthew Barnes)
+	#532286: Fix some whitespace issues, and make the Caps Lock label smaller (Matthew Barnes)
+	#533058: Enable GROUPWISE_DEBUG logs (Sankar P)
+	#533780: Link against libebackend (Ed Catmur)
+	#534077: Don't use freed memory (Paul Smith)
+	#534294: Fix a crash when checking for junk in a virtual folder (Hiroyuki Ikezoe)
+	#534312: Support to save Forwarded flag (Milan Crha)
+
+Updated Translations:
+	Philip Withnall (en_GB)
+	Clytie Siddall (vi)
+	Ivar Smolin (et)
+	Tino Meinen (nl)
+	Gil Forcada (ca)
+	Jorge Gonzalez (es)
+	Kjartan Maraas (nb)
+	Djihed Afifi (ar)
+	Yair Hershkovitz (he)
+	Theppitak Karoonboonyanan (th)
+
 Evolution-Data-Server 2.23.2 2008-05-12
 ----------------------------------------
 

Modified: branches/camel-db-summary/calendar/libecal/e-cal-component.c
==============================================================================
--- branches/camel-db-summary/calendar/libecal/e-cal-component.c	(original)
+++ branches/camel-db-summary/calendar/libecal/e-cal-component.c	Tue Jun  3 03:40:35 2008
@@ -307,8 +307,15 @@
 
 	priv->status = NULL;
 
-	for (l = priv->attachment_list; l != NULL; l = l->next)
-		g_free (l->data);
+	for (l = priv->attachment_list; l != NULL; l = l->next) {
+		struct attachment *attachment;
+
+		attachment = l->data;
+
+		icalattach_unref (attachment->attach);
+		g_free (attachment);
+	}
+
 	g_slist_free (priv->attachment_list);
 	priv->attachment_list = NULL;
 

Modified: branches/camel-db-summary/camel/camel-folder-summary.h
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-summary.h	(original)
+++ branches/camel-db-summary/camel/camel-folder-summary.h	Tue Jun  3 03:40:35 2008
@@ -77,6 +77,7 @@
 	CAMEL_MESSAGE_USER_NOT_DELETABLE = 1<<9,
 	CAMEL_MESSAGE_HIDDEN = 1<<10,
 	CAMEL_MESSAGE_NOTJUNK = 1<<11,
+	CAMEL_MESSAGE_FORWARDED = 1<<12,
 
 	/* following flags are for the folder, and are not really permanent flags */
 	CAMEL_MESSAGE_FOLDER_FLAGGED = 1<<16, /* for use by the folder implementation */

Modified: branches/camel-db-summary/camel/camel-mime-utils.c
==============================================================================
--- branches/camel-db-summary/camel/camel-mime-utils.c	(original)
+++ branches/camel-db-summary/camel/camel-mime-utils.c	Tue Jun  3 03:40:35 2008
@@ -3416,8 +3416,11 @@
 			}
 		} else {
 			g_string_append_printf (out, "%s%s=", p->name, encoded ? "*" : "");
-
-			if (encoded || !quote)
+			
+			/* Quote even if we don't need to in order to
+			 * work around broken mail software like the
+			 * Jive Forums' NNTP gateway */
+			if (encoded /*|| !quote*/)
 				g_string_append (out, value);
 			else
 				quote_word (out, TRUE, value, vlen);

Modified: branches/camel-db-summary/camel/providers/imap/camel-imap-command.c
==============================================================================
--- branches/camel-db-summary/camel/providers/imap/camel-imap-command.c	(original)
+++ branches/camel-db-summary/camel/providers/imap/camel-imap-command.c	Tue Jun  3 03:40:35 2008
@@ -305,11 +305,19 @@
 	switch (*respbuf) {
 	case '*':
 		if (!g_ascii_strncasecmp (respbuf, "* BYE", 5)) {
+			const char *err = NULL;
+
+			if (respbuf [5] && g_ascii_strncasecmp (respbuf + 6, "[ALERT] ", 8) == 0)
+				err = respbuf + 14;
+
+			if (!err || !*err)
+				err = g_strerror (104);
+
 			/* Connection was lost, no more data to fetch */
 			camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 					      _("Server unexpectedly disconnected: %s"),
-					      _("Unknown error")); /* g_strerror (104));  FIXME after 1.0 is released */
+					      err);
 			store->connected = FALSE;
 			g_free (respbuf);
 			respbuf = NULL;

Modified: branches/camel-db-summary/camel/providers/imap/camel-imap-store-summary.c
==============================================================================
--- branches/camel-db-summary/camel/providers/imap/camel-imap-store-summary.c	(original)
+++ branches/camel-db-summary/camel/providers/imap/camel-imap-store-summary.c	Tue Jun  3 03:40:35 2008
@@ -339,7 +339,7 @@
 		d(printf("  '%s' -> '%s'\n", pathu8, full_name));
 		camel_store_info_set_string((CamelStoreSummary *)s, (CamelStoreInfo *)info, CAMEL_IMAP_STORE_INFO_FULL_NAME, full_name);
 
-		if (g_ascii_strcasecmp(full_name, "inbox"))
+		if (!g_ascii_strcasecmp(full_name, "inbox"))
 			info->info.flags |= CAMEL_FOLDER_SYSTEM|CAMEL_FOLDER_TYPE_INBOX;
 	} else
 		d(printf("  failed\n"));

Modified: branches/camel-db-summary/camel/providers/local/camel-maildir-store.c
==============================================================================
--- branches/camel-db-summary/camel/providers/local/camel-maildir-store.c	(original)
+++ branches/camel-db-summary/camel/providers/local/camel-maildir-store.c	Tue Jun  3 03:40:35 2008
@@ -445,6 +445,7 @@
 			if (strcmp(d->d_name, "tmp") == 0
 			    || strcmp(d->d_name, "cur") == 0
 			    || strcmp(d->d_name, "new") == 0
+			    || strcmp(d->d_name, ".#evolution") == 0
 			    || strcmp(d->d_name, ".") == 0
 			    || strcmp(d->d_name, "..") == 0)
 				continue;

Modified: branches/camel-db-summary/configure.in
==============================================================================
--- branches/camel-db-summary/configure.in	(original)
+++ branches/camel-db-summary/configure.in	Tue Jun  3 03:40:35 2008
@@ -4,7 +4,7 @@
 # Evolution-Data-Server version */
 m4_define([eds_major_version], [2])
 m4_define([eds_minor_version], [23])
-m4_define([eds_micro_version], [3])
+m4_define([eds_micro_version], [4])
 
 m4_define([eds_version],
           [eds_major_version.eds_minor_version.eds_micro_version])

Modified: branches/camel-db-summary/docs/reference/camel/tmpl/camel-folder-summary.sgml
==============================================================================
--- branches/camel-db-summary/docs/reference/camel/tmpl/camel-folder-summary.sgml	(original)
+++ branches/camel-db-summary/docs/reference/camel/tmpl/camel-folder-summary.sgml	Tue Jun  3 03:40:35 2008
@@ -118,6 +118,7 @@
 @CAMEL_MESSAGE_USER_NOT_DELETABLE: 
 @CAMEL_MESSAGE_HIDDEN: 
 @CAMEL_MESSAGE_NOTJUNK: 
+ CAMEL_MESSAGE_FORWARDED: 
 @CAMEL_MESSAGE_FOLDER_FLAGGED: 
 @CAMEL_MESSAGE_JUNK_LEARN: 
 @CAMEL_MESSAGE_USER: 

Modified: branches/camel-db-summary/libedataserver/e-data-server-util.c
==============================================================================
--- branches/camel-db-summary/libedataserver/e-data-server-util.c	(original)
+++ branches/camel-db-summary/libedataserver/e-data-server-util.c	Tue Jun  3 03:40:35 2008
@@ -28,6 +28,10 @@
 
 #include <glib.h>
 
+#ifdef G_OS_WIN32
+#include <mbstring.h>
+#endif
+
 #include "e-data-server-util.h"
 
 /**
@@ -524,32 +528,22 @@
         *full_prefix = NULL;
         *cp_prefix = NULL;
 
-        if (G_WIN32_HAVE_WIDECHAR_API ()) {
-                /* NT-based Windows has wide char API */
-                if (GetModuleFileNameW ((HMODULE) hmodule, wcbfr, G_N_ELEMENTS (wcbfr))) {
-                        *full_prefix = g_utf16_to_utf8 (wcbfr, -1,
-                                                        NULL, NULL, NULL);
-                        if (GetShortPathNameW (wcbfr, wcbfr, G_N_ELEMENTS (wcbfr)) &&
-                            /* Short pathnames always contain only
-                             * ASCII, I think, but just in case, be
-                             * prepared.
-                             */
-                            WideCharToMultiByte (CP_ACP, 0, wcbfr, -1,
-                                                 cpbfr, G_N_ELEMENTS (cpbfr),
-                                                 NULL, NULL))
-                                *cp_prefix = g_strdup (cpbfr);
-                        else if (*full_prefix)
-                                *cp_prefix = g_locale_from_utf8 (*full_prefix, -1,
-                                                                 NULL, NULL, NULL);
-                }
-        } else {
-                /* Win9x */
-                if (GetModuleFileNameA ((HMODULE) hmodule, cpbfr, G_N_ELEMENTS (cpbfr))) {
-                        *full_prefix = g_locale_to_utf8 (cpbfr, -1,
-                                                         NULL, NULL, NULL);
-                        *cp_prefix = g_strdup (cpbfr);
-                }
-        }
+	if (GetModuleFileNameW ((HMODULE) hmodule, wcbfr, G_N_ELEMENTS (wcbfr))) {
+		*full_prefix = g_utf16_to_utf8 (wcbfr, -1,
+						NULL, NULL, NULL);
+		if (GetShortPathNameW (wcbfr, wcbfr, G_N_ELEMENTS (wcbfr)) &&
+		    /* Short pathnames always contain only
+		     * ASCII, I think, but just in case, be
+		     * prepared.
+		     */
+		    WideCharToMultiByte (CP_ACP, 0, wcbfr, -1,
+					 cpbfr, G_N_ELEMENTS (cpbfr),
+					 NULL, NULL))
+			*cp_prefix = g_strdup (cpbfr);
+		else if (*full_prefix)
+			*cp_prefix = g_locale_from_utf8 (*full_prefix, -1,
+							 NULL, NULL, NULL);
+	}
 
         if (*full_prefix != NULL) {
                 gchar *p = strrchr (*full_prefix, '\\');

Modified: branches/camel-db-summary/servers/groupwise/e-gw-connection.c
==============================================================================
--- branches/camel-db-summary/servers/groupwise/e-gw-connection.c	(original)
+++ branches/camel-db-summary/servers/groupwise/e-gw-connection.c	Tue Jun  3 03:40:35 2008
@@ -678,7 +678,7 @@
 	/* process response */
 	response = soup_soap_message_parse_response (msg);
 	
-	if (g_getenv ("GROUPWISE_DEBUG")) {
+	if (response && g_getenv ("GROUPWISE_DEBUG")) {
 
 		/* README: The stdout can be replaced with Evolution's
 		Logging framework also */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]