Accepting request 92895 from home:dimstar:branches:GNOME:Factory

Update to 3.3.2

OBS-URL: https://build.opensuse.org/request/show/92895
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=114
This commit is contained in:
Dominique Leuenberger 2011-11-28 08:29:10 +00:00 committed by Git OBS Bridge
parent 994c19c190
commit a4a7b01597
5 changed files with 22 additions and 47 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9882e7a9c9f79723004c6af77948da48ee9160ee9e01b788c2e6f3d23382fc53
size 2301596

3
seahorse-3.3.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b4a40af9b8329f030c4e8c60f62154790bfda97a2acea415e2ee642b6afe649
size 2301061

View File

@ -1,40 +0,0 @@
commit bf10531f540db1941fb3418c01b01b45d7d196e9
Author: Vincent Untz <vuntz@gnome.org>
Date: Thu Oct 13 19:09:04 2011 +0200
Fix crash when adding a non-LDAP keyserver
https://bugzilla.gnome.org/show_bug.cgi?id=661683
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index 93f6c2f..8afbc7a 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -233,20 +233,21 @@ calculate_keyserver_uri (SeahorseWidget *swidget)
const gchar *host = NULL;
const gchar *port = NULL;
GtkWidget *widget;
- GList *types;
+ gchar **types;
gint active;
gchar *uri;
+ guint i;
/* Figure out the scheme */
widget = GTK_WIDGET (seahorse_widget_get_widget (swidget, "keyserver-type"));
g_return_val_if_fail (widget != NULL, NULL);
active = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
- if (active >= 0) {
- types = g_object_get_data (G_OBJECT (swidget), "keyserver-types");
- scheme = (const gchar*)g_list_nth_data (types, active);
- if (scheme && !scheme[0])
- scheme = NULL;
+ types = g_object_get_data (G_OBJECT (swidget), "keyserver-types");
+ if (active >= 0 && types) {
+ for (i = 0; types[i] != NULL && i < active; i++);
+ if (i == active && types[active] && types[active][0])
+ scheme = types[active];
}
/* The host */

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Nov 21 13:24:08 UTC 2011 - dimstar@opensuse.org
- Update to version 3.3.2:
+ Refactoring of how actions work
+ Add ability to lock and unlock places from the sidebar
+ Implement login to smart cards and PKCS#11 tokens
+ Remove experimental check selection on sidebar
+ Listing of private keys on smart cards and PKCS#11 tokens
+ Showing matching keys and certificates together, in listing and
properties
+ Build fixes
+ Don't crash if gpg or gpg2 don't run correctly.
+ Fix problems editing PGP key servers
+ Don't load key signatures unless showing key properties
+ Updated translations.
- Drop seahorse-fix-crash-on-keyserver-add.patch: fixed upstream.
-------------------------------------------------------------------
Thu Oct 27 08:58:37 UTC 2011 - dimstar@opensuse.org

View File

@ -21,13 +21,11 @@
Name: seahorse
License: GPLv2+
Group: Productivity/Security
Version: 3.3.1.1
Version: 3.3.2
Release: 1
Summary: GNOME interface for gnupg
Url: http://projects.gnome.org/seahorse/
Source: http://download.gnome.org/sources/seahorse/3.3/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM seahorse-fix-crash-on-keyserver-add.patch bgo#661683 bnc#723908 vuntz@opensuse.org -- Fix crash when adding a keyserver
Patch0: seahorse-fix-crash-on-keyserver-add.patch
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: gpg2
@ -59,7 +57,6 @@ Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
%configure \