Merge fix for bug #125403 from stable.

2003-10-24  Kjartan Maraas  <kmaraas@gnome.org>

	* capplets/display/main.c: (create_screen_widgets): Merge
	fix for bug #125403 from stable.
This commit is contained in:
Kjartan Maraas 2003-10-24 15:42:55 +00:00 committed by Kjartan Maraas
parent 6e33aefa39
commit f6ebb39b30
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2003-10-24 Kjartan Maraas <kmaraas@gnome.org>
* capplets/display/main.c: (create_screen_widgets): Merge
fix for bug #125403 from stable.
Mon Sep 8 10:55:23 2003 Jonathan Blandford <jrb@redhat.com>
* configure.in: Release 2.4.0

View file

@ -366,6 +366,7 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
GtkWidget *table;
GtkWidget *label;
GtkWidget *option_menu;
GtkWidget *ret;
char *str;
table = gtk_table_new (2, 2, FALSE);
@ -416,9 +417,9 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
str = g_strdup (_("Default Settings"));
else
str = g_strdup_printf (_("Screen %d Settings\n"), nr+1);
return wrap_in_label (table, str);
ret = wrap_in_label (table, str);
g_free (str);
return ret;
}