Hello community, here is the log from the commit of package seahorse for openSUSE:Factory checked in at Thu Oct 13 19:57:38 CEST 2011.
-------- --- openSUSE:Factory/seahorse/seahorse.changes 2011-10-02 11:15:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/seahorse/seahorse.changes 2011-10-13 19:11:00.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 13 17:10:48 UTC 2011 - [email protected] + +- Add seahorse-fix-crash-on-keyserver-add.patch: fix crash when + adding a keyserver. Fix bnc#723908. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- seahorse-fix-crash-on-keyserver-add.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seahorse.spec ++++++ --- /var/tmp/diff_new_pack.5IqqQZ/_old 2011-10-13 19:57:31.000000000 +0200 +++ /var/tmp/diff_new_pack.5IqqQZ/_new 2011-10-13 19:57:31.000000000 +0200 @@ -26,6 +26,8 @@ Summary: GNOME interface for gnupg Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.2/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM seahorse-fix-crash-on-keyserver-add.patch bgo#661683 bnc#723908 [email protected] -- Fix crash when adding a keyserver +Patch0: seahorse-fix-crash-on-keyserver-add.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gpg2 @@ -55,6 +57,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure \ ++++++ seahorse-fix-crash-on-keyserver-add.patch ++++++ commit bf10531f540db1941fb3418c01b01b45d7d196e9 Author: Vincent Untz <[email protected]> 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 */ continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
