Attachment 830535 Details for Bug 999297 – 0002-Add-show_dialog-option-to-get_authentication

[patch] 0002-Add-show_dialog-option-to-get_authentication

0002-Add-show_dialog-option-to-get_authentication.patch (text/plain), 2.10 KB, created by Andre Heinecke on 2013-11-29 09:04:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Heinecke

Created: 2013-11-29 09:04:22 UTC

Size: 2.10 KB

patch

obsolete

>From 1994a55cab9323e4c6b9de41af038488e6799f50 Mon Sep 17 00:00:00 2001
>From: Andre Heinecke <aheinecke@intevation.de>
>Date: Fri, 29 Nov 2013 09:49:53 +0100
>Subject: [PATCH 2/3] Add show_dialog option to get_authentication
>
>    This allows to silently check if the authentication credentials
>    can be found in the keyring and only shows the interactive
>    password dialog when running as applet.
>---
> jobviewer.py |   13 +++++++++----
> 1 files changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/jobviewer.py b/jobviewer.py
>index 83fe8a9..cd619a0 100644
>--- a/jobviewer.py
>+++ b/jobviewer.py
>@@ -909,12 +909,17 @@ class JobViewer (GtkGUI):
>         job_requires_auth = (s == cups.IPP_JOB_HELD and
>                              data.get ('job-hold-until', 'none') ==
>                              'auth-info-required')
>-        if self.applet and job_requires_auth:
>+        if job_requires_auth:
>+            # Try to get the authentication information. If we are not
>+            # running as an applet just try to get the information silently
>+            # and not prompt the user.
>             self.get_authentication (job, data.get ('device-uri'),
>-                                     data.get ('auth-info-required', []))
>+                                     data.get ('auth-info-required', []),
>+                                     self.applet)
>         self.update_sensitivity ()
> 
>-    def get_authentication (self, job, device_uri, auth_info_required):
>+    def get_authentication (self, job, device_uri, auth_info_required,
>+                            show_dialog):
>         # Check if we have requested authentication for this job already
>         if not self.auth_info_dialogs.has_key (job):
>             try:
>@@ -1009,7 +1014,7 @@ class JobViewer (GtkGUI):
>                     c._end_operation ()
>                     nonfatalException ()
> 
>-            if auth_info_required:
>+            if auth_info_required and show_dialog:
>                 username = pwd.getpwuid (os.getuid ())[0]
>                 keyring_attrs["user"] = str (username)
>                 self.display_auth_info_dialog (job, keyring_attrs)
>-- 
>1.7.2.5
>

Actions: View | Diff

Attachments on bug 999297: 814931 | 814932 | 814934 | 830534 | 830535 | 830537