diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-09-27 21:56:10 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-09-27 21:56:10 +0000 |
| commit | 1e43b24c5049fed8b058902a141d7590acb4147c (patch) | |
| tree | 3f5cacdb8cd832c3d4cbb50b32b78ec8be78e6e9 | |
| parent | 38e2770fbfb873bf23e0fba30fcea188f478c443 (diff) | |
| download | gdm-1e43b24c5049fed8b058902a141d7590acb4147c.tar.gz | |
Use g_markup_printf_escaped so gdmsetup better handles description strings
2006-09-27 Brian Cameron <brian.cameron@sun.com>
* gui/gdmsetup.c: Use g_markup_printf_escaped so gdmsetup better
handles description strings that contains things similar to
a tag like an email address. Fix bug #357998. Patch by
Matthias Clasen <mclasen@redhat.com>.
* gui/gdmsession.c: Add comment about valgrind complaining that
session is leaked.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gui/gdmsession.c | 1 | ||||
| -rw-r--r-- | gui/gdmsetup.c | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,5 +1,14 @@ 2006-09-27 Brian Cameron <brian.cameron@sun.com> + * gui/gdmsetup.c: Use g_markup_printf_escaped so gdmsetup better + handles description strings that contains things similar to + a tag like an email address. Fix bug #357998. Patch by + Matthias Clasen <mclasen@redhat.com>. + * gui/gdmsession.c: Add comment about valgrind complaining that + session is leaked. + +2006-09-27 Brian Cameron <brian.cameron@sun.com> + * gui/gdmconfig.c, gui/greeter/greeter_parser.c: Fix more memory leaks. Fixes bug #357879. Patch provided by Kjartan Maraas. <kmaraas@gnome.org>. diff --git a/gui/gdmsession.c b/gui/gdmsession.c index 76b788ac..da6c62ef 100644 --- a/gui/gdmsession.c +++ b/gui/gdmsession.c @@ -134,6 +134,7 @@ gdm_session_list_init () } if (gdm_config_get_bool (GDM_KEY_SHOW_XTERM_FAILSAFE)) { + /* Valgrind complains that the below is leaked */ session = g_new0 (GdmSession, 1); session->name = g_strdup (_("Failsafe _Terminal")); session->comment = g_strdup (_("This is a failsafe session that will log you " diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c index 3ebe4eb3..29557a9e 100644 --- a/gui/gdmsetup.c +++ b/gui/gdmsetup.c @@ -3423,7 +3423,7 @@ read_themes (GtkListStore *store, const char *theme_dir, DIR *dir, } } - 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, |