rpms/claws-mail-plugins/F-11 fancy-free.patch, NONE, 1.1 claws-mail-plugins.spec, 1.42, 1.43

[Andreas Bierfert]

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15131/F-11

Modified Files:
	claws-mail-plugins.spec 
Added Files:
	fancy-free.patch 
Log Message:
- fix #515373


fancy-free.patch:
 fancy_viewer.c |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE fancy-free.patch ---
diff -Nur claws-mail-extra-plugins-3.7.2/fancy-0.9.7/src/fancy_viewer.c /home/kevin/projects/claws-mail/plugins/fancy/src/fancy_viewer.c
--- claws-mail-extra-plugins-3.7.2/fancy-0.9.7/src/fancy_viewer.c	2009-06-19 01:36:50.000000000 -0600
+++ /home/kevin/projects/claws-mail/plugins/fancy/src/fancy_viewer.c	2009-07-04 10:34:52.000000000 -0600
@@ -107,8 +107,19 @@
         return FALSE;
     }
     if (procmime_get_part(viewer->filename, partinfo) < 0) {
-            g_free(viewer->filename);
+        g_free(viewer->filename);
+        viewer->filename = NULL;
     } else {
+        const gchar *charset = NULL;
+        if (_viewer && _viewer->mimeview &&
+            _viewer->mimeview->messageview->forced_charset)
+            charset = _viewer->mimeview->messageview->forced_charset;
+        else
+            charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
+        if (!charset)
+            charset = conv_get_locale_charset_str();
+        debug_print("using %s charset\n", charset);
+        g_object_set(viewer->settings, "default-encoding", charset, NULL);
         gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL);
         webkit_web_view_open(viewer->view, tmp);
         g_free(tmp);
@@ -182,6 +193,7 @@
     debug_print("filename: %s\n", viewer->filename);
 	if (!viewer->filename) {
 		alertpanel_error(_("Filename is null."));
+        g_free(program);
 		return;
 	}
 
@@ -275,8 +287,6 @@
     webkit_web_view_open(viewer->view, "about:blank");
     debug_print("fancy_clear_viewer\n");
     viewer->to_load = NULL;
-    if(viewer->cur_link)
-        g_free(viewer->cur_link);
     vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(viewer->scrollwin));
     vadj->value = 0.0;
     g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0);
@@ -345,12 +355,9 @@
 {
     gtk_label_set_text(GTK_LABEL(viewer->l_link), link);
     if(link) {
-        if (viewer->cur_link) {
+        if (viewer->cur_link)
             g_free(viewer->cur_link);
-            viewer->cur_link = g_strdup(link);
-        } else {
-            viewer->cur_link = g_strdup(link);
-        }
+        viewer->cur_link = g_strdup(link);
     }
 }
 
@@ -795,7 +802,7 @@
 
 const gchar *plugin_desc(void)
 {
-    return g_strdup_printf("This plugin renders HTML e-mail using the WebKit" 
+    return g_strdup_printf("This plugin renders HTML mail using the WebKit " 
                            "%d.%d.%d library.", WEBKIT_MAJOR_VERSION, 
                            WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION);
 }


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-11/claws-mail-plugins.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- claws-mail-plugins.spec	7 Jul 2009 04:42:02 -0000	1.42
+++ claws-mail-plugins.spec	7 Aug 2009 06:37:34 -0000	1.43
@@ -19,13 +19,15 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
 License:        GPLv2 and GPLv3+ and MIT
 URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
+# fix double free in fancy plugin (#515373) from upstream svn
+Patch0:         fancy-free.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  claws-mail-devel >= %{version}
@@ -268,6 +270,7 @@ exporting of your meetings or all your c
 
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
+%patch0 -p1
 
 %build
 #acpi_notifier
@@ -606,6 +609,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Fri Aug 07 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.2-3
+- fix crash in fancy plugin (#515373)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 06 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.2-1
 - version upgrade