From ff2cddb63c8765854c9bc091851daa77d3e1e0ba Mon Sep 17 00:00:00 2001 From: kwm Date: Sat, 2 Jan 2010 19:53:23 +0000 Subject: Update to 2.29.4. Merge the patch-hal-keyboard and patch-hal-keyboard.2 into 1 patch. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13342 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gdm/files/patch-gui_simple-greeter_gdm-user.c | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 x11/gdm/files/patch-gui_simple-greeter_gdm-user.c (limited to 'x11/gdm/files/patch-gui_simple-greeter_gdm-user.c') diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c new file mode 100644 index 000000000..e5fb649c6 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c @@ -0,0 +1,34 @@ +--- gui/simple-greeter/gdm-user.c.orig 2009-12-16 17:52:36.000000000 -0500 ++++ gui/simple-greeter/gdm-user.c 2009-12-18 21:43:38.000000000 -0500 +@@ -425,6 +425,7 @@ _gdm_user_update (GdmUser *u + /* Display Name */ + if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') { + gchar *first_comma = NULL; ++ gchar *ampersand; + gchar *valid_utf8_name = NULL; + + if (g_utf8_validate (pwent->pw_gecos, -1, NULL)) { +@@ -449,6 +450,23 @@ _gdm_user_update (GdmUser *u + g_free (real_name); + real_name = NULL; + } ++ ++ while (real_name != NULL && (ampersand = strchr (real_name, '&')) != NULL) { ++ gchar *temp_real_name1; ++ gchar *temp_real_name2; ++ gchar *temp_name; ++ ++ temp_real_name1 = g_strndup (real_name, ++ (ampersand - real_name)); ++ temp_real_name2 = g_strdup (ampersand + 1); ++ temp_name = g_strdup (pwent->pw_name); ++ temp_name[0] = toupper (temp_name[0]); ++ g_free (real_name); ++ real_name = g_strdup_printf ("%s%s%s", temp_real_name1, temp_name, temp_real_name2); ++ g_free (temp_real_name1); ++ g_free (temp_real_name2); ++ g_free (temp_name); ++ } + } else { + real_name = NULL; + } -- cgit v1.2.3