rpms/control-center/F-12 shell-markup.patch, NONE, 1.1 control-center.spec, 1.494, 1.495

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23020

Modified Files:
	control-center.spec 
Added Files:
	shell-markup.patch 
Log Message:
don't show markup in the ui


shell-markup.patch:
 app-shell.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE shell-markup.patch ---
diff -up gnome-control-center-2.28.0/libslab/app-shell.c.shell-markup gnome-control-center-2.28.0/libslab/app-shell.c
--- gnome-control-center-2.28.0/libslab/app-shell.c.shell-markup	2009-10-02 01:03:41.999269098 -0400
+++ gnome-control-center-2.28.0/libslab/app-shell.c	2009-10-02 01:05:13.150267868 -0400
@@ -726,7 +726,6 @@ static void
 show_no_results_message (AppShellData * app_data, GtkWidget * containing_vbox)
 {
 	gchar *markup;
-	gchar *str1;
 	gchar *str2;
 	
 	if (!app_data->filtered_out_everything_widget)
@@ -750,8 +749,7 @@ show_no_results_message (AppShellData * 
 		gtk_container_add (GTK_CONTAINER (app_data->filtered_out_everything_widget), hbox);
 	}
 
-	str1 = g_strdup_printf ("<b>%s</b>", app_data->filter_string);
-	str2 = g_strdup_printf (_("Your filter \"%s\" does not match any items."), str1);
+	str2 = g_strdup_printf (_("Your filter \"%s\" does not match any items."), app_data->filter_string);
 	markup = g_markup_printf_escaped ("<span size=\"large\"><b>%s</b></span>\n\n%s",
 		_("No matches found."), str2);
 	gtk_label_set_text (app_data->filtered_out_everything_widget_label, markup);
@@ -759,6 +757,7 @@ show_no_results_message (AppShellData * 
 	gtk_box_pack_start (GTK_BOX (containing_vbox), app_data->filtered_out_everything_widget,
 		TRUE, TRUE, 0);
 	g_free (markup);
+	g_free (str2);
 }
 
 static void


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- control-center.spec	30 Sep 2009 13:36:58 -0000	1.494
+++ control-center.spec	2 Oct 2009 05:12:39 -0000	1.495
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch50: fix-background-tooltips.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=593866
 Patch51: mirror-crash.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597066
+Patch52: shell-markup.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -196,6 +199,7 @@ for the GNOME desktop.
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .fix-background-tooltips
 %patch51 -p1 -b .mirror-crash
+%patch52 -p1 -b .shell-markup
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -386,6 +390,9 @@ fi
 
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-13
+- Don't show markup in the UI
+
 * Wed Sep 30 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-12
 - Fix a crash in the display capplet