File system-config-printer-bnc456110-non-blocking-pr... of Package system-config-printer

Overview Repositories Revisions Requests Users Attributes Meta

File system-config-printer-bnc456110-non-blocking-probe.patch of Package system-config-printer (Revision 04e45829366cf5bd01b63fca0383f816)

Currently displaying revision 04e45829366cf5bd01b63fca0383f816 , Show latest

diff --git a/probe_printer.py b/probe_printer.py
index fd9f5f7..3dfcb51 100644
--- a/probe_printer.py
+++ b/probe_printer.py
@@ -19,6 +19,7 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import socket, time
+import gtk
 
 class LpdServer:
     def __init__(self, hostname):
@@ -43,6 +44,7 @@ class LpdServer:
             af, socktype, proto, canonname, sa = res
             try:
                 s = socket.socket(af, socktype, proto)
+                s.settimeout(0.5)
             except socket.error, msg:
                 s = None
                 continue
@@ -56,6 +58,9 @@ class LpdServer:
         return s
 
     def _probe_queue(self,name, result):
+        while gtk.events_pending ():
+            gtk.main_iteration ()
+
         s = self._open_socket()
         if not s: return False
         print name
diff --git a/system-config-printer.py b/system-config-printer.py
index 887f9d9..210078c 100755
--- a/system-config-printer.py
+++ b/system-config-printer.py
@@ -5734,7 +5734,12 @@ class NewPrinterGUI(GtkGUI):
         # read hostname, probe, fill printer names
         hostname = self.cmbentNPTLpdHost.get_active_text()
         server = probe_printer.LpdServer(hostname)
+
+        self.WaitWindow.set_transient_for (self.NewPrinterWindow)
+        self.WaitWindow.show ()
         printers = server.probe()
+        self.WaitWindow.hide ()
+
         model = self.cmbentNPTLpdQueue.get_model()
         model.clear()
         for printer in printers:

Places

File system-config-printer-bnc456110-non-blocking-probe.patch of Package system-config-printer (Revision 04e45829366cf5bd01b63fca0383f816)

Places