rpms/evolution
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of migrated signature files.

Browse source
This commit is contained in:
Matthew Barnes 2010-08-06 16:32:36 -04:00
commit fbb4f8fcc9
2 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

50
evolution-2.31.6-signature-migration.patch Normal file
View file

@ -0,0 +1,50 @@
diff -up evolution-2.31.6/e-util/e-signature.c.signature-migration evolution-2.31.6/e-util/e-signature.c
--- evolution-2.31.6/e-util/e-signature.c.signature-migration 2010-08-02 18:50:02.000000000 -0400
+++ evolution-2.31.6/e-util/e-signature.c 2010-08-06 16:30:18.702805091 -0400
@@ -493,28 +493,27 @@ e_signature_set_from_xml (ESignature *si
}
break;
}
-
- /* If the signature is not a script, replace the directory
- * part with the current signatures directory. This makes
- * moving the signatures directory transparent. */
- if (!e_signature_get_is_script (signature)) {
- const gchar *user_data_dir;
- gchar *basename;
- gchar *filename;
-
- user_data_dir = e_get_user_data_dir ();
-
- filename = signature->priv->filename;
- basename = g_path_get_basename (filename);
- signature->priv->filename = g_build_filename (
- user_data_dir, "signatures", basename, NULL);
- g_free (basename);
- g_free (filename);
- }
-
cur = cur->next;
}
+ /* If the signature is not a script, replace the directory
+ * part with the current signatures directory. This makes
+ * moving the signatures directory transparent. */
+ if (!e_signature_get_is_script (signature)) {
+ const gchar *user_data_dir;
+ gchar *basename;
+ gchar *filename;
+
+ user_data_dir = e_get_user_data_dir ();
+
+ filename = signature->priv->filename;
+ basename = g_path_get_basename (filename);
+ signature->priv->filename = g_build_filename (
+ user_data_dir, "signatures", basename, NULL);
+ g_free (basename);
+ g_free (filename);
+ }
+
xmlFreeDoc (doc);
return changed;

9
evolution.spec
View file

@ -33,7 +33,7 @@
Name: evolution
Version: 2.31.6
Release: 1%{?dist}
Release: 2%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -58,6 +58,9 @@ Patch13: evolution-2.30.1-help-contents.patch
# Remove leftover dbus-glib calls.
Patch14: evolution-2.31.6-no-dbus-glib.patch
# Fix handling of migrated signature files.
Patch15: evolution-2.31.6-signature-migration.patch
## Dependencies ###
Requires(pre): GConf2
@ -211,6 +214,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
%patch12 -p1 -b .im-context-reset
%patch13 -p1 -b .help-contents
%patch14 -p1 -b .no-dbus-glib
%patch15 -p1 -b .signature-migration
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -618,6 +622,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Fri Aug 06 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.6-2.fc14
- Fix handling of migrated signature files.
* Tue Aug 03 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.6-1.fc14
- Update to 2.31.6
- Drop dbus-glib requirement.