3e3f56dbf5
use of a deprecated gpgme function. Changes in this version: * Loading large key rings is now many orders of magnitude faster * A simple panel with common tasks shows up in the key manager the first time a new user starts [Adam Schreiber] * Gnome HIG (Human Interface Guidelines) compliancy fixes * gedit plugin compiles with GNOME 2.8 * gedit plugin now works on BSD [Julio M. Merino Vidal] * seahorse-agent now works properly on BSD [Julio M. Merino Vidal] * disable password caching prefs when using a different agent * seahorse-agent restores gpg.conf when exiting * seahorse-agent icon now shows properly in the notification area * Properly detect mlock for secure memory usage. * Fixed crash when changing expiry date on a subkey * Fixed crash when using 'Encrypt To Self' without a default key * Default key selection now works properly in edge cases. * Updated RPM spec file * A multitude of smaller bug fixes
39 lines
1.2 KiB
Text
39 lines
1.2 KiB
Text
$NetBSD: patch-aa,v 1.6 2004/11/07 13:19:24 jmmv Exp $
|
|
|
|
--- libseahorse/seahorse-util.c.orig 2004-10-14 11:40:11.000000000 -0600
|
|
+++ libseahorse/seahorse-util.c
|
|
@@ -226,11 +226,12 @@ seahorse_util_write_data_to_file (const
|
|
gchar *buffer;
|
|
gint nread;
|
|
|
|
- /*
|
|
- * TODO: gpgme_data_seek doesn't work for us right now
|
|
- * probably because of different off_t sizes
|
|
- */
|
|
- gpgme_data_rewind (data);
|
|
+ /* Reset the read pointer in data */
|
|
+ if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
|
|
+ {
|
|
+ gpg_err_code_t e = gpg_err_code_from_errno (errno);
|
|
+ return GPG_E (e);
|
|
+ }
|
|
|
|
file = seahorse_vfs_data_create (path, TRUE, &err);
|
|
if(file != NULL)
|
|
@@ -270,11 +271,11 @@ seahorse_util_write_data_to_text (gpgme_
|
|
guint nread = 0;
|
|
GString *string;
|
|
|
|
- /*
|
|
- * TODO: gpgme_data_seek doesn't work for us right now
|
|
- * probably because of different off_t sizes
|
|
- */
|
|
- gpgme_data_rewind (data);
|
|
+ /* Reset the read pointer in data */
|
|
+ if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
|
|
+ {
|
|
+ return NULL;
|
|
+ }
|
|
|
|
string = g_string_new ("");
|
|
buffer = g_new (gchar, size);
|