[X2go-Commits] pyhoca-gui.git - build-main (branch) updated: 0.1.0.5-8-g5887f89
X2go dev team
git-admin at x2go.org
Mon Jul 4 20:16:13 CEST 2011
The branch, build-main has been updated
via 5887f89da2b562aeb68b295078b2fb5d45c4db1f (commit)
via 05cfc1a637fd8a5244b610207f8c8d70c443556c (commit)
via 544bab8bfa04efcd1fb339f78df583ed467dd82e (commit)
via 3160d3c795a6a01415611622e75c9cb34909e9a9 (commit)
via b8de53ad4d828750cf6b31707be8db0fb9e9843a (commit)
via 7837ad69ebcd3bc72b20f227b161538abc5d8bcd (commit)
via d4b8884865dcd55fd450cd40deb8ad804e9cf17a (commit)
via 718e39e05816677779b7481dcf10dfd122fdd31f (commit)
from c336e8a87da20287a0631a78e37a74118dc9c06f (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:
README | 2 +-
TODO | 3 +--
debian/changelog | 15 +++++++++++++--
debian/control | 2 +-
po/de.po | 2 +-
pyhoca/wxgui/__init__.py | 2 +-
pyhoca/wxgui/notify.py | 9 ++++++++-
7 files changed, 26 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/README b/README
index 9573837..36b2700 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ Please refer to the TODO file that has been shipped with pyhoca-gui.
Thanks in advance for your feedback and contributions,
-Kiel (Germany) & LJ Almere Haven (Netherlands), 20101231
+Kiel (Germany) & LJ Almere Haven (Netherlands), 20110701
Dick Kniep <dick.kniep at lindix.nl>
Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/TODO b/TODO
index 56ea4de..07f2148 100644
--- a/TODO
+++ b/TODO
@@ -8,7 +8,6 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy.
* profile manager (Windows registry based)
* options manager
-* grouping of profiles in session profile menu
* shadow session support
=== pyhoca-gui Wishlist ===
@@ -18,7 +17,7 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy.
If you find any issues with this programme please let me know.
-Kiel (Germany) & LJ Almere Haven (Netherlands), 20110419
+Kiel (Germany) & LJ Almere Haven (Netherlands), 20110701
Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Dick Kniep <dick.kniep at lindix.nl>
diff --git a/debian/changelog b/debian/changelog
index 461ee18..3b99600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,15 @@
-pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low
+pyhoca-gui (0.1.0.6-0~x2go3) UNRELEASED; urgency=low
+
+ * New upstream version (0.1.0.6):
+ - bugfix release.
+ - unicode fix for Windows notifications
+ - i18n fixes
+ - README/TODO update.
+ * Properly depend on Python X2go package.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 01 Jul 2011 14:04:42 +0200
+
+pyhoca-gui (0.1.0.5-0~x2go1) unstable; urgency=low
* New upstream version (0.1.0.5):
- bugfix release
@@ -16,7 +27,7 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low
* React to bug #627990, prefer man2html-base over man2html.
* Depend on Python X2go 0.1.1.2
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 24 Jun 2011 16:39:24 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 01 Jul 2011 13:55:42 +0200
pyhoca-gui (0.1.0.4-0~x2go1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 23b5475..e8a5e8b 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Architecture: all
Depends:
${misc:Depends},
python,
- python-x2go (>=0.1.1.2-0~0),
+ python-x2go (>=0.1.1.2-0~),
python-argparse,
python-notify,
python-setproctitle,
diff --git a/po/de.po b/po/de.po
index 5e602ff..95370ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -979,7 +979,7 @@ msgid ""
"user. The PyHoca-GUI icon can be found in your desktops's\n"
"notification area/systray."
msgstr ""
-"PyHoca-GUI is bereits gestartet für Benutzer/in ,,%s''!\n"
+"PyHoca-GUI ist bereits gestartet für Benutzer/in ,,%s''!\n"
"\n"
"Nur eine Instanz von PyHoca-GUI kann pro Benutzer/in\n"
"gestartet werden. Das PyHoca-GUI Icon befindet sich auf\n"
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index b8617d3..d9494a0 100644
--- a/pyhoca/wxgui/__init__.py
+++ b/pyhoca/wxgui/__init__.py
@@ -18,6 +18,6 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-__VERSION__ = '0.1.0.5'
+__VERSION__ = '0.1.0.6'
from frontend import *
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index b0a2160..af6a2d6 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -173,7 +173,14 @@ class notificationmessage_NotifierPopup(object):
# wx.NotificationMessage class
pass
- self._pyhoca_logger('[%s] %s' % (title.encode(utils.get_encoding()), text.encode(utils.get_encoding())), loglevel=log.loglevel_NOTICE)
+ # on Windows some error messages are already encoded, some are not, depending from which module they come
+ try: _title = title.encode(utils.get_encoding())
+ except: _title = title
+ try: _text = text.encode(utils.get_encoding())
+ except: _text = text
+
+ try: self._pyhoca_logger('['+_title+'] '+_text, loglevel=log.loglevel_NOTICE)
+ except UnicodeDecodeError: self._pyhoca_logger('Unicode error occurred while rendering a log message...', loglevel=log.loglevel_WARN)
def Close(self):
pass
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