r25258 - in /desktop/unstable/gdm3/debian: changelog patches/26_username_escape.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Oct  2 16:43:09 2010
New Revision: 25258

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25258
Log:
26_username_escape.patch: stolen in upstream git (2.30 branch). Fix 
escaping in the user list.

Added:
    desktop/unstable/gdm3/debian/patches/26_username_escape.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25258&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sat Oct  2 16:43:09 2010
@@ -1,14 +1,16 @@
-gdm3 (2.30.5-3) UNRELEASED; urgency=low
+gdm3 (2.30.5-3) unstable; urgency=low
 
   [ Josselin Mouette ]
   * pt_BR.po: new Brazilian Portuguese translation by Sérgio Cipolla.
     Closes: #597669.
+  * 26_username_escape.patch: stolen in upstream git (2.30 branch). Fix 
+    escaping in the user list.
 
   [ Luca Bruno ]
   * 13_gdmsetup.patch: refresh and fix user-manager loading according
     to upstream changes. Closes: #598034.
 
- -- Luca Bruno <lethalman88 at gmail.com>  Thu, 23 Sep 2010 22:55:13 +0200
+ -- Josselin Mouette <joss at debian.org>  Sat, 02 Oct 2010 18:41:24 +0200
 
 gdm3 (2.30.5-2) unstable; urgency=low
 

Added: desktop/unstable/gdm3/debian/patches/26_username_escape.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/26_username_escape.patch?rev=25258&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/26_username_escape.patch (added)
+++ desktop/unstable/gdm3/debian/patches/26_username_escape.patch [utf-8] Sat Oct  2 16:43:09 2010
@@ -1,0 +1,47 @@
+From f9996fb5412beeef293b542c0640b69f1f7a0eaa Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 13 Aug 2010 15:20:09 +0000
+Subject: More username escape fixes
+
+commit b2f79db8cee486964f562e818e2bf96a420e7965 fixed the
+"add_item" case but not the "update_item" case. This commit
+addresses that.
+
+http://bugzilla.gnome.org/show_bug.cgi?id=624847
+---
+diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
+index b7bd0a0..5f30160 100644
+--- a/gui/simple-greeter/gdm-user-chooser-widget.c
++++ b/gui/simple-greeter/gdm-user-chooser-widget.c
+@@ -182,6 +182,8 @@ update_item_for_user (GdmUserChooserWidget *widget,
+         char         *tooltip;
+         gboolean      is_logged_in;
+         int           size;
++        char         *escaped_username;
++        char         *escaped_real_name;
+ 
+ 
+         size = get_icon_height_for_widget (GTK_WIDGET (widget));
+@@ -201,14 +203,18 @@ update_item_for_user (GdmUserChooserWidget *widget,
+                  is_logged_in,
+                  pixbuf);
+ 
++        escaped_username = g_markup_escape_text (gdm_user_get_user_name (user), -1);
++        escaped_real_name = g_markup_escape_text (gdm_user_get_real_name (user), -1);
+         gdm_chooser_widget_update_item (GDM_CHOOSER_WIDGET (widget),
+-                                        gdm_user_get_user_name (user),
++                                        escaped_username,
+                                         pixbuf,
+-                                        gdm_user_get_real_name (user),
++                                        escaped_real_name,
+                                         tooltip,
+                                         gdm_user_get_login_frequency (user),
+                                         is_logged_in,
+                                         FALSE);
++        g_free (escaped_real_name);
++        g_free (escaped_username);
+         g_free (tooltip);
+ 
+         if (pixbuf != NULL) {
+--
+cgit v0.8.3.1

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=25258&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sat Oct  2 16:43:09 2010
@@ -26,4 +26,5 @@
 23_autologin_once.patch
 24_show_user_other.patch
 25_upower.patch
+26_username_escape.patch
 90_relibtoolize.patch