[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-70-g3b35f6c
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:55:37 CEST 2013
The branch, twofactorauth has been updated
via 3b35f6c1274bdc00ebe61d38cd60eceeb4ee0484 (commit)
from 5d3209c70a8bdde0789870afc2f141e1efbbcb53 (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 | 5 +++++
2 files changed, 6 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a15dd3a..69fafc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Provide empty translation file nb_NO.po.
- Fix profile manager GUI layout, make default keyboard layout i18n
capable.
+ - Handle the situation that no printers are installed with CUPS/WinSpool.
* 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 25693a9..6089087 100644
--- a/pyhoca/wxgui/printingprefs.py
+++ b/pyhoca/wxgui/printingprefs.py
@@ -223,6 +223,11 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
_printer_name = self._availablePrinters[self.client_printing.get_property('printer')]
except KeyError:
_printer_name = self._availablePrinters[self._defaultPrinter]
+ elif self._defaultPrinter == None:
+ _printer_name = _(u'- no printers installed -')
+ self.PrintPrinter.Clear()
+ self.PrintPrinter.Append(_(_printer_name))
+ self.PrintPrinter.Enable(False)
else:
_printer_name = _(u'- print system is not available -')
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)).
More information about the x2go-commits
mailing list