rpms/system-config-printer/F-11 system-config-printer-proxy-auth.patch, NONE, 1.1 system-config-printer.spec, 1.277, 1.278

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1749

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-proxy-auth.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
- Fixed proxy authentication.


system-config-printer-proxy-auth.patch:
 jobviewer.py |   25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

--- NEW FILE system-config-printer-proxy-auth.patch ---
diff -up system-config-printer-1.1.12/jobviewer.py.proxy-auth system-config-printer-1.1.12/jobviewer.py
--- system-config-printer-1.1.12/jobviewer.py.proxy-auth	2009-08-28 16:40:54.624947867 +0100
+++ system-config-printer-1.1.12/jobviewer.py	2009-08-28 16:42:01.430823181 +0100
@@ -604,10 +604,8 @@ class JobViewer (GtkGUI, monitor.Watcher
                     else:
                         (serverport, rest) = urllib.splithost (rest)
                         (server, port) = urllib.splitnport (serverport)
-                    username = pwd.getpwuid (os.getuid ())[0]
                     keyring_attrs.update ({ "server": str (server.lower ()),
-                                            "protocol": str (scheme),
-                                            "user": str (username)})
+                                            "protocol": str (scheme)})
 
                 if job in self.authenticated_jobs:
                     # We've already tried to authenticate this job before.
@@ -656,19 +654,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                         c._end_operation ()
                         nonfatalException ()
 
-                self.display_auth_info_dialog (job)
-
-    def on_auth_notification_closed (self, notification, reason=None):
-        job = notification.get_data ('job-id')
-        debugprint ("auth notification closed for job %s" % job)
-        self.auth_notifications[job].set_data ('closed', True)
-        del self.auth_notifications[job]
-
-    def on_auth_notification_authenticate (self, notification, action):
-        job = notification.get_data ('job-id')
-        keyring_attrs = notification.get_data ('keyring-attrs')
-        debugprint ("auth notification authenticate for job %s" % job)
-        self.display_auth_info_dialog (job, keyring_attrs)
+                username = pwd.getpwuid (os.getuid ())[0]
+                keyring_attrs["user"] = str (username)
+                self.display_auth_info_dialog (job, keyring_attrs)
 
     def display_auth_info_dialog (self, job, keyring_attrs=None):
         data = self.jobs[job]
@@ -759,8 +747,9 @@ class JobViewer (GtkGUI, monitor.Watcher
                                            attrs.get ("protocol"))
                     ind = auth_info_required.index ('password')
                     secret = auth_info[ind]
-                    gnomekeyring.item_create_sync (keyring, type, name,
-                                                   attrs, secret, True)
+                    id = gnomekeyring.item_create_sync (keyring, type, name,
+                                                        attrs, secret, True)
+                    debugprint ("keyring: created id %d for %s" % (id, name))
             except:
                 nonfatalException ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- system-config-printer.spec	26 Aug 2009 16:51:10 -0000	1.277
+++ system-config-printer.spec	28 Aug 2009 15:45:25 -0000	1.278
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
+Patch4: system-config-printer-proxy-auth.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -68,6 +69,7 @@ the configuration tool.
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
+%patch4 -p1 -b .proxy-auth
 
 %build
 %configure
@@ -169,6 +171,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
+- Fixed proxy authentication.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
 - Handle icon load failure gracefully.
 - Fixed statereason icon names.