Hello community, here is the log from the commit of package gnome-keyring checked in at Tue May 9 12:17:57 CEST 2006. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2006-01-25 21:31:44.000000000 +0100 +++ STABLE/gnome-keyring/gnome-keyring.changes 2006-05-08 20:21:40.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 8 20:21:01 CEST 2006 - joeshaw@suse.de + +- Add a patch to correctly escape for markup, and set the markup + flag on the label. (bnc #172603) + +------------------------------------------------------------------- New: ---- gnome-keyring-use-markup-correctly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.vHolkb/_old 2006-05-09 12:17:41.000000000 +0200 +++ /var/tmp/diff_new_pack.vHolkb/_new 2006-05-09 12:17:41.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package gnome-keyring (Version 0.4.6) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,12 +15,13 @@ %define prefix /opt/gnome %define sysconfdir /etc%{prefix} Version: 0.4.6 -Release: 1 +Release: 17 URL: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL, LGPL Summary: GNOME Keyring Password Manager Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2 +Patch1: gnome-keyring-use-markup-correctly.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,6 +56,7 @@ %prep %setup -q +%patch1 %build rename no nb po/no.* @@ -92,6 +94,9 @@ %{prefix}/include/* %changelog -n gnome-keyring +* Mon May 08 2006 - joeshaw@suse.de +- Add a patch to correctly escape for markup, and set the markup + flag on the label. (bnc #172603) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Nov 30 2005 - gekker@suse.de ++++++ gnome-keyring-use-markup-correctly.patch ++++++ ? gnome-keyring-use-markup-correctly.patch Index: gnome-keyring-ask.c =================================================================== RCS file: /cvs/gnome/gnome-keyring/gnome-keyring-ask.c,v retrieving revision 1.13 diff -u -p -u -r1.13 gnome-keyring-ask.c --- gnome-keyring-ask.c 24 Oct 2005 07:03:34 -0000 1.13 +++ gnome-keyring-ask.c 8 May 2006 18:11:36 -0000 @@ -51,7 +51,8 @@ const char *env_item_name; static char * create_markup (const char *primary, const char *secondary) { - return g_strconcat ("", primary, "</span>\n\n", secondary, NULL); + return g_markup_printf_escaped ("%s</span>\n\n%s", + primary, secondary); } static char * @@ -142,9 +143,10 @@ run_dialog (const char *title, 0, 1, 0 ,1); message = create_markup (primary, secondary); - message_widget = GTK_LABEL (gtk_label_new (message)); + message_widget = GTK_LABEL (gtk_label_new (NULL)); + gtk_label_set_use_markup (message_widget, TRUE); + gtk_label_set_markup (message_widget, message); g_free (message); - gtk_label_set_use_markup (message_widget, TRUE); gtk_misc_set_alignment (GTK_MISC (message_widget), 0.0, 0.5); gtk_label_set_line_wrap (message_widget, TRUE); gtk_label_set_justify (message_widget, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...