gdm r5742 - in trunk: . gui/simple-greeter

[bcameron svn gnome org]

Author: bcameron
Date: Sat Feb  9 01:58:17 2008
New Revision: 5742
URL: http://svn.gnome.org/viewvc/gdm?rev=5742&view=rev

Log:
2008-02-08  Brian Cameron  <brian cameron sun com>

        * gui/gdm-languages.c:  Fix NULL print issue causing crash
          on Solaris.


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-languages.c

Modified: trunk/gui/simple-greeter/gdm-languages.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-languages.c	(original)
+++ trunk/gui/simple-greeter/gdm-languages.c	Sat Feb  9 01:58:17 2008
@@ -809,7 +809,9 @@
         }
 
         if (territory != NULL) {
-                full_language  = g_strdup_printf ("%s (%s)", language, territory);
+                full_language  = g_strdup_printf ("%s (%s)",
+                        language ? language : "",
+                        territory ? territory : "");
         } else {
                 full_language  = g_strdup (language);
         }