r34868 - in /desktop/experimental/seahorse/debian: changelog patches/10_gpgme_keyring_finalize_typo.patch patches/11_unavailable_signature_entries.patch patches/12_align_keyids_with_name_userid.patch patches/series
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Tue May 15 00:12:12 UTC 2012
Author: jordi
Date: Tue May 15 00:12:10 2012
New Revision: 34868
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34868
Log:
* Add 10_gpgme_keyring_finalize_typo.patch from upstream Git to fix a
build failure caused by a typo.
* Add 11_unavailable_signature_entries.patch from upstream Git to avoid
getting erroneous "Unavailable entries" for key signatures.
* Add 12_align_keyids_with_name_userid.patch from upstream Git to
align keyids with name/signatures in key properties.
Added:
desktop/experimental/seahorse/debian/patches/10_gpgme_keyring_finalize_typo.patch
desktop/experimental/seahorse/debian/patches/11_unavailable_signature_entries.patch
desktop/experimental/seahorse/debian/patches/12_align_keyids_with_name_userid.patch
Modified:
desktop/experimental/seahorse/debian/changelog
desktop/experimental/seahorse/debian/patches/series
Modified: desktop/experimental/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/changelog?rev=34868&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/changelog [utf-8] (original)
+++ desktop/experimental/seahorse/debian/changelog [utf-8] Tue May 15 00:12:10 2012
@@ -10,6 +10,12 @@
* Don't suggest seahorse-plugins.
* Bump Standards-Version to 3.9.3, no changes needed.
* Refresh 99_ltmain_as-needed.patch with copy from dh-autoreconf.
+ * Add 10_gpgme_keyring_finalize_typo.patch from upstream Git to fix a
+ build failure caused by a typo.
+ * Add 11_unavailable_signature_entries.patch from upstream Git to avoid
+ getting erroneous "Unavailable entries" for key signatures.
+ * Add 12_align_keyids_with_name_userid.patch from upstream Git to
+ align keyids with name/signatures in key properties.
-- Jordi Mallach <jordi at debian.org> Tue, 15 May 2012 01:08:48 +0200
Added: desktop/experimental/seahorse/debian/patches/10_gpgme_keyring_finalize_typo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/10_gpgme_keyring_finalize_typo.patch?rev=34868&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/patches/10_gpgme_keyring_finalize_typo.patch (added)
+++ desktop/experimental/seahorse/debian/patches/10_gpgme_keyring_finalize_typo.patch [utf-8] Tue May 15 00:12:10 2012
@@ -1,0 +1,21 @@
+From 5286af2304b3a59a2deeb508433c13d96fe2287c Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Mon, 30 Apr 2012 18:29:42 +0000
+Subject: Fix typo in finalizing of GPGME keyring
+
+---
+diff --git a/pgp/seahorse-gpgme-keyring.c b/pgp/seahorse-gpgme-keyring.c
+index 79ff39b..579ab09 100644
+--- a/pgp/seahorse-gpgme-keyring.c
++++ b/pgp/seahorse-gpgme-keyring.c
+@@ -859,7 +859,7 @@ seahorse_gpgme_keyring_finalize (GObject *object)
+ {
+ SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object);
+
+- g_clear_object (self->pv->actions);
++ g_clear_object (&self->pv->actions);
+ g_hash_table_destroy (self->pv->keys);
+
+ /* All monitoring and scheduling should be done */
+--
+cgit v0.9.0.2
Added: desktop/experimental/seahorse/debian/patches/11_unavailable_signature_entries.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/11_unavailable_signature_entries.patch?rev=34868&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/patches/11_unavailable_signature_entries.patch (added)
+++ desktop/experimental/seahorse/debian/patches/11_unavailable_signature_entries.patch [utf-8] Tue May 15 00:12:10 2012
@@ -1,0 +1,50 @@
+From 4833b9c66251dc7bf0aa6d75292de633093ffea5 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Mon, 30 Apr 2012 20:17:14 +0000
+Subject: Unavailable entries were displayed incorrectly for signatures
+
+ * Only load unknown keys for ones that we can't find locally
+
+https://bugzilla.gnome.org/show_bug.cgi?id=675015
+---
+diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
+index b473a8a..36df01f 100644
+--- a/pgp/seahorse-pgp-backend.c
++++ b/pgp/seahorse-pgp-backend.c
+@@ -701,20 +701,20 @@ seahorse_pgp_backend_discover_keys (SeahorsePgpBackend *self,
+ robjects = g_list_prepend (robjects, key);
+ }
+
+- g_ptr_array_add (todiscover, NULL);
+-
+- /* Start a discover process on all todiscover */
+- if (todiscover != NULL &&
+- g_settings_get_boolean (seahorse_context_settings (NULL), "server-auto-retrieve")) {
+- seahorse_pgp_backend_retrieve_async (self, (const gchar **)todiscover->pdata,
+- SEAHORSE_PLACE (self->keyring),
+- cancellable, NULL, NULL);
+- }
+-
+- /* Add unknown objects for all these */
+- for (i = 0; keyids[i] != NULL; i++) {
+- object = seahorse_unknown_source_add_object (self->unknown, keyids[i], cancellable);
+- robjects = g_list_prepend (robjects, object);
++ if (todiscover->len > 0) {
++ g_ptr_array_add (todiscover, NULL);
++ keyids = (const gchar **)todiscover->pdata;
++
++ /* Start a discover process on all todiscover */
++ if (g_settings_get_boolean (seahorse_context_settings (NULL), "server-auto-retrieve"))
++ seahorse_pgp_backend_retrieve_async (self, keyids, SEAHORSE_PLACE (self->keyring),
++ cancellable, NULL, NULL);
++
++ /* Add unknown objects for all these */
++ for (i = 0; keyids[i] != NULL; i++) {
++ object = seahorse_unknown_source_add_object (self->unknown, keyids[i], cancellable);
++ robjects = g_list_prepend (robjects, object);
++ }
+ }
+
+ g_ptr_array_free (todiscover, TRUE);
+--
+cgit v0.9.0.2
Added: desktop/experimental/seahorse/debian/patches/12_align_keyids_with_name_userid.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/12_align_keyids_with_name_userid.patch?rev=34868&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/patches/12_align_keyids_with_name_userid.patch (added)
+++ desktop/experimental/seahorse/debian/patches/12_align_keyids_with_name_userid.patch [utf-8] Tue May 15 00:12:10 2012
@@ -1,0 +1,34 @@
+From 7fafa3ccda857a8d65259e50060f5a6bcb5e0a0a Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Mon, 30 Apr 2012 20:23:37 +0000
+Subject: Align keyids with name/signatures in key properties
+
+ * In the table for names/signatures, align the keyid with the
+ name/userid markup
+---
+diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
+index dafd3bf..019d945 100644
+--- a/pgp/seahorse-pgp-key-properties.c
++++ b/pgp/seahorse-pgp-key-properties.c
+@@ -532,13 +532,17 @@ do_names (SeahorseWidget *swidget)
+ "gicon", UIDSIG_ICON, NULL);
+
+ /* TRANSLATORS: The name and email set on the PGP key */
++ renderer = gtk_cell_renderer_text_new ();
++ g_object_set (renderer, "yalign", 0.0, "xalign", 0.0, NULL);
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget),
+- -1, _("Name/Email"), gtk_cell_renderer_text_new (),
++ -1, _("Name/Email"), renderer,
+ "markup", UIDSIG_NAME, NULL);
+
+ /* The signature ID column */
++ renderer = gtk_cell_renderer_text_new ();
++ g_object_set (renderer, "yalign", 0.0, "xalign", 0.0, NULL);
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget),
+- -1, _("Signature ID"), gtk_cell_renderer_text_new (),
++ -1, _("Signature ID"), renderer,
+ "text", UIDSIG_KEYID, NULL);
+ }
+
+--
+cgit v0.9.0.2
Modified: desktop/experimental/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/series?rev=34868&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/patches/series [utf-8] (original)
+++ desktop/experimental/seahorse/debian/patches/series [utf-8] Tue May 15 00:12:10 2012
@@ -1,3 +1,6 @@
08_force_ssh.patch
+10_gpgme_keyring_finalize_typo.patch
+11_unavailable_signature_entries.patch
+12_align_keyids_with_name_userid.patch
30_preferences_menu.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list