[gdm/gnome-2-20] Fixes for gdmsetup

[Brian Cameron <bcameron src gnome org>]

commit 3919879d3999aa7d745550f0663c1062446e2d58
Author: Brian Cameron <Brian Cameron sun com>
Date:   Mon Jun 8 11:58:11 2009 -0500

    Fixes for gdmsetup
    
    Fix call in gdmsetup.c to g_markup_printf_escaped so that NULL strings are
    not passed in.
---
 ChangeLog      |    5 +++++
 gui/gdmsetup.c |    4 +++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d047f7a..25a6b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-08 Brian Cameron <brian cameron sun com>
+
+	* gui/gdmsetup.c: Fix call to g_markup_printf_escaped so that NULL
+	  strings are not passed in.
+
 2009-05-13 Brian Cameron <brian cameron sun com>
 
 	* gui/gdmlogin.c, gui/greeter/greeter.c: Fix the dialog that asks the
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 8da6794..12358cb 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -4826,7 +4826,9 @@ read_themes (GtkListStore *store, const char *theme_dir, DIR *dir,
 			}
 		}			   
 					   
-		markup = g_markup_printf_escaped ("<b>%s</b>\n<small>%s</small>", name, desc);
+		markup = g_markup_printf_escaped ("<b>%s</b>\n<small>%s</small>",
+                   name ? name : "(null)",
+                   desc ? desc : "(null)");
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (store, &iter,
 				    THEME_COLUMN_SELECTED, sel_theme,