r31688 - in /packages/unstable/gnome-shell/debian: changelog patches/06-polkit-Find-the-best-user-to-authenticate-as.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Nov 20 21:43:03 2011
New Revision: 31688

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31688
Log:
* debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch:
  + Added. When picking a user to authenticate with, try the current user
  first, then root and if all else fails the first user that is allowed to
  authenticate. (from upstream git)

Added:
    packages/unstable/gnome-shell/debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch
Modified:
    packages/unstable/gnome-shell/debian/changelog
    packages/unstable/gnome-shell/debian/patches/series

Modified: packages/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/changelog?rev=31688&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/changelog [utf-8] Sun Nov 20 21:43:03 2011
@@ -1,3 +1,12 @@
+gnome-shell (3.0.2-7) UNRELEASED; urgency=low
+
+  * debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch:
+    + Added. When picking a user to authenticate with, try the current user
+    first, then root and if all else fails the first user that is allowed to
+    authenticate. (from upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 20 Nov 2011 21:40:33 +0000
+
 gnome-shell (3.0.2-6) unstable; urgency=low
 
   * debian/patches/05_fix_glib_2.30_compat.patch:

Added: packages/unstable/gnome-shell/debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch?rev=31688&op=file
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch (added)
+++ packages/unstable/gnome-shell/debian/patches/06-polkit-Find-the-best-user-to-authenticate-as.patch [utf-8] Sun Nov 20 21:43:03 2011
@@ -1,0 +1,53 @@
+From 3a667be3ca532e603dca31b3d9859e527a883f0c Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Thu, 17 Nov 2011 22:42:37 -0500
+Subject: [PATCH] polkit: Find the best user to authenticate as
+
+We prefer to ask the user for his own password. If PolicyKit
+is not configured to accept that, try the root password. If
+PolicyKit does not accept that either, ask for password of
+the first user that PolicyKit _will_ accept. The last case
+is a bit broken, but should rarely occur in real-life
+configurations.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=651547
+
+Conflicts:
+
+	js/ui/polkitAuthenticationAgent.js
+---
+ js/ui/polkitAuthenticationAgent.js |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js
+index 4a0fdf6..7184c8a 100644
+--- a/js/ui/polkitAuthenticationAgent.js
++++ b/js/ui/polkitAuthenticationAgent.js
+@@ -29,6 +29,7 @@ const Clutter = imports.gi.Clutter;
+ const St = imports.gi.St;
+ const Pango = imports.gi.Pango;
+ const Gdm = imports.gi.Gdm;
++const GLib = imports.gi.GLib;
+ const Gio = imports.gi.Gio;
+ const Mainloop = imports.mainloop;
+ const Polkit = imports.gi.Polkit;
+@@ -89,10 +90,14 @@ AuthenticationDialog.prototype = {
+         if (userNames.length > 1) {
+             log('polkitAuthenticationAgent: Received ' + userNames.length +
+                 ' identities that can be used for authentication. Only ' +
+-                'considering the first one.');
++                'considering one.');
+         }
+ 
+-        let userName = userNames[0];
++        let userName = GLib.get_user_name();
++        if (userNames.indexOf(userName) < 0)
++            userName = 'root';
++        if (userNames.indexOf(userName) < 0)
++            userName = userNames[0];
+ 
+         this._user = Gdm.UserManager.ref_default().get_user(userName);
+         let userRealName = this._user.get_real_name()
+-- 
+1.7.7.3
+

Modified: packages/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/series?rev=31688&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/patches/series [utf-8] Sun Nov 20 21:43:03 2011
@@ -3,3 +3,4 @@
 03_hidden_applications.patch
 04_remove-glx-dependency-on-armel.patch
 05_fix_glib_2.30_compat.patch
+06-polkit-Find-the-best-user-to-authenticate-as.patch