From: Colin Leroy <colin@colino.net>
Date: Fri, 15 Mar 2013 09:33:27 +0000 (+0000)
Subject: 2013-03-15 [colin]	3.9.0cvs126
X-Git-Tag: 3.9.1~68
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=87b1d665e397d123d29ba89f61573c3762bf8b7f

2013-03-15 [colin]	3.9.0cvs126

	* src/plugins/fancy/fancy_viewer.c
		Fix attached images URIs generation
	* src/plugins/vcalendar/vcal_folder.c
		Fix crash on NULL uri
---

diff --git a/ChangeLog b/ChangeLog
index ef2588f53..f4a0b24b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-15 [colin]	3.9.0cvs126
+
+	* src/plugins/fancy/fancy_viewer.c
+		Fix attached images URIs generation
+	* src/plugins/vcalendar/vcal_folder.c
+		Fix crash on NULL uri
+
 2013-03-14 [colin]	3.9.0cvs125
 
 	* src/plugins/fancy/fancy_viewer.c
diff --git a/PATCHSETS b/PATCHSETS
index 7276fe8cc..a8ad563c3 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4623,3 +4623,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs123.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fancy/Makefile.am;  diff -u /dev/null src/plugins/fancy/claws.def;  diff -u /dev/null src/plugins/fancy/plugin.def;  diff -u /dev/null src/plugins/fancy/version.rc;  ) > 3.9.0cvs124.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/fancy/fancy_viewer.c;  ) > 3.9.0cvs125.patchset
+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/fancy/fancy_viewer.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/vcal_folder.c;  ) > 3.9.0cvs126.patchset
diff --git a/configure.ac b/configure.ac
index 63729ffc4..94498f7e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=125
+EXTRA_VERSION=126
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index b04d526df..7581f82f4 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -414,7 +414,7 @@ static void resource_request_starting_cb(WebKitWebView		*view,
 				if ((err = procmime_get_part(filename, partinfo)) < 0)
 					alertpanel_error(_("Couldn't save the part of multipart message: %s"),
 										strerror(-err));
-				gchar *file_uri = g_strconcat("file://", filename, NULL);
+				gchar *file_uri = g_filename_to_uri(filename, NULL, NULL);
 				webkit_network_request_set_uri(request, file_uri);
 				g_free(file_uri);
 				g_free(filename);
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 76209920f..1e24a097a 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1988,6 +1988,9 @@ gboolean vcal_subscribe_uri(Folder *folder, const gchar *uri)
 	if (folder->klass != vcal_folder_get_class())
 		return FALSE;
 
+	if (uri == NULL)
+		return FALSE;
+
 	if (!strncmp(uri, "webcal://", 9)) {
 		tmp = g_strconcat("http://", uri+9, NULL);
 	} else {