[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-117-g2bc0921

[X2Go dev team]

The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  2bc0921e14c4a7afb42636aa9b4cbc7b3cf2ad6d (commit)
      from  69050e8fca3b4e468f09bf51534b859c328ab86d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    1 +
 pyhoca/wxgui/printingprefs.py |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f5bd84b..4a6606f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       Introduce cmd line option --published-applications-no-submenus <int>.
     - The maximum number of menu items in published applications mode can now
       be specified as a session option for X2goSession instances.
+    - Fix for CUPS printer recognition if no default printer was defined.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py
index 2c94ae2..1c8de98 100644
--- a/pyhoca/wxgui/printingprefs.py
+++ b/pyhoca/wxgui/printingprefs.py
@@ -219,11 +219,14 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
         self.PdfViewCmd.SetValue(self.client_printing.get_property('pdfview_cmd'))
         self.PdfSaveToFolder.SetValue(self.client_printing.get_property('save_to_folder'))
         if self._defaultPrinter != '#PRINTSYSTEM_UNAVAILABLE#':
-            if self._defaultPrinter != None:
+            if self._availablePrinters:
                 try:
                     _printer_name = self._availablePrinters[self.client_printing.get_property('printer')]
                 except KeyError:
-                    _printer_name = self._availablePrinters[self._defaultPrinter]
+                    if self._defaultPrinter != None:
+                        _printer_name = self._availablePrinters[self._defaultPrinter]
+                    else:
+                        _printer_name = self._availablePrinters[self._availablePrinters.keys()[0]]
             else:
                 _printer_name = _(u'- no printers installed -')
                 self.PrintPrinter.Clear()


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).