rpms/gdm/devel gdm-2.16.0-markup.patch, NONE, 1.1 gdm.spec, 1.201, 1.202

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2419

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.16.0-markup.patch 
Log Message:
fix a markup problem


gdm-2.16.0-markup.patch:
 gdmsetup.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gdm-2.16.0-markup.patch ---
--- gdm-2.16.0/gui/gdmsetup.c.markup	2006-09-27 12:28:12.000000000 -0400
+++ gdm-2.16.0/gui/gdmsetup.c	2006-09-27 12:30:01.000000000 -0400
@@ -3423,7 +3423,7 @@
 			}
 		}			   
 					   
-		markup = g_strdup_printf ("<b>%s</b>\n<small>%s</small>", name, desc);
+		markup = g_markup_printf_escaped ("<b>%s</b>\n<small>%s</small>", name, desc);
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (store, &iter,
 				    THEME_COLUMN_SELECTED, sel_theme,


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- gdm.spec	19 Sep 2006 15:51:45 -0000	1.201
+++ gdm.spec	27 Sep 2006 16:40:39 -0000	1.202
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.16.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -49,6 +49,9 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=203917
 Patch25: gdm-2.16.0-indic-langs.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=357998
+Patch26: gdm-2.16.0-markup.patch
+
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
 Prereq: /usr/sbin/useradd
@@ -118,6 +121,7 @@
 %patch21 -p1 -b .security-tokens
 %patch24 -p1 -b .wtmp
 %patch25 -p1 -b .indic-langs
+%patch26 -p1 -b .markup
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -305,6 +309,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Sep 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.0-9.fc6
+- Fix a problem with the display of the FedoraDNA theme
+  in gdmsetup
+
 * Tue Sep 19 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0-8.fc6
 - Add as_IN, si_LK to language list (bug 203917)