x2go-commits May 2012

x2go-commits@lists.x2go.org

1 participants
85 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-236-g406d9c0
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via 406d9c04b562dc27c37ec082a8091aeb6b993fa4 (commit) from 91247a4fd865197fa21c2978689ba17c3171644d (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 ----------------------------------------------------------------- commit 406d9c04b562dc27c37ec082a8091aeb6b993fa4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 09:40:38 2012 +0200 Fix control session failure notifications. Show them immediately after the connection broke. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/client.py | 29 ++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 14dc935..cabacf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -123,6 +123,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Adapt python-x2go to launching Unity-2d on Ubuntu precise. - Ignore X windows with empty title while finding session window.. - Catch exceptions while calling SSH transport's getpeername() method. + - Fix control session failure notifications. Show them immediately after + the connection broke. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/client.py b/x2go/client.py index 749c081..7e81e4b 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -468,7 +468,6 @@ class X2goClient(object): # this HOOK has to return either True (accept host connection) or False (deny host conection) return True - def HOOK_on_control_session_death(self, profile_name): """\ HOOK method: called if a control session (server connection) has unexpectedly encountered a failure. @@ -1486,8 +1485,8 @@ class X2goClient(object): return self.session_registry(session_uuid).resume(session_name=session_name) except x2go_exceptions.X2goControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - if self.disconnect_profile(profile_name): - self.HOOK_on_control_session_death(profile_name) + self.HOOK_on_control_session_death(profile_name) + self.disconnect_profile(profile_name) __resume_session = resume_session def suspend_session(self, session_uuid, session_name=None): @@ -1527,8 +1526,8 @@ class X2goClient(object): return self.session_registry(session_uuid).control_session.suspend(session_name=session_name) except x2go_exceptions.X2goControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - if self.disconnect_profile(profile_name): - self.HOOK_on_control_session_death(profile_name) + self.HOOK_on_control_session_death(profile_name) + self.disconnect_profile(profile_name) __suspend_session = suspend_session def terminate_session(self, session_uuid, session_name=None): @@ -1567,8 +1566,8 @@ class X2goClient(object): return self.session_registry(session_uuid).control_session.terminate(session_name=session_name) except x2go_exceptions.X2goControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - if self.disconnect_profile(profile_name): - self.HOOK_on_control_session_death(profile_name) + self.HOOK_on_control_session_death(profile_name) + self.disconnect_profile(profile_name) __terminate_session = terminate_session def get_session_profile_name(self, session_uuid): @@ -2216,8 +2215,8 @@ class X2goClient(object): return self.session_registry(session_uuid).is_alive() except x2go_exceptions.X2goControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - if self.disconnect_profile(profile_name): - self.HOOK_on_control_session_death(profile_name) + self.HOOK_on_control_session_death(profile_name) + self.disconnect_profile(profile_name) return False __server_is_alive = server_is_alive @@ -2744,8 +2743,8 @@ class X2goClient(object): try: self.session_registry.update_status(profile_name=profile_name, session_list=session_list) except x2go_exceptions.X2goControlSessionException: - if self.disconnect_profile(profile_name): - self.HOOK_on_control_session_death(profile_name) + self.HOOK_on_control_session_death(profile_name) + self.disconnect_profile(profile_name) __update_sessionregistry_status_by_profile_name = update_sessionregistry_status_by_profile_name def update_sessionregistry_status_by_session_uuid(self, session_uuid): @@ -2798,8 +2797,8 @@ class X2goClient(object): try: self.listsessions_cache.update(profile_name, update_sessions=_update_sessions, update_desktops=_update_desktops, update_mounts=_update_mounts, ) except x2go_exceptions.X2goControlSessionException: - if self.disconnect_profile(profile_name): - self.HOOK_on_control_session_death(profile_name) + self.HOOK_on_control_session_death(profile_name) + self.disconnect_profile(profile_name) __update_cache_by_profile_name = update_cache_by_profile_name def update_cache_by_session_uuid(self, session_uuid, cache_types=('sessions'), update_sessions=None, update_desktops=None, update_mounts=None): @@ -2878,8 +2877,8 @@ class X2goClient(object): try: self.session_registry.register_available_server_sessions(profile_name, session_list=session_list) except x2go_exceptions.X2goControlSessionException: - if self.disconnect_profile(profile_name): - self.HOOK_on_control_session_death(profile_name) + self.HOOK_on_control_session_death(profile_name) + self.disconnect_profile(profile_name) __register_available_server_sessions_by_profile_name = register_available_server_sessions_by_profile_name def register_available_server_sessions_by_session_uuid(self, session_uuid): hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-244-gb15b026
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via b15b026507355da01f19925b1c864a7d82f3579f (commit) from f8fc633098b1c35bbcce8b2be0a63a2ef5ecc439 (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 ----------------------------------------------------------------- commit b15b026507355da01f19925b1c864a7d82f3579f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 09:21:31 2012 +0200 os.path.is<type> require string option, not Unicode. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/splash.py | 4 ++-- pyhoca/wxgui/taskbar.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e46a53e..ddd42e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -132,6 +132,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Fallback to default splash image if the custom splash does not exist. - Do not crash if a provided system tray icon cannot be found. Use a fallback icon instead. + - os.path.is<type> require string option, not Unicode. * 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/splash.py b/pyhoca/wxgui/splash.py index af35bab..86b659b 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -40,13 +40,13 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen): if splash_image and os.path.basename(splash_image) == splash_image: splash_image = os.path.join(basepath.images_basepath, splash_image) - if not os.path.isfile(splash_image): + if not os.path.isfile(str(splash_image)): splash_image = None if splash_image is None: splash_image = os.path.join(basepath.images_basepath, 'pyhoca-splash.png') - if os.path.isfile(splash_image): + if os.path.isfile(str(splash_image)): splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, ) splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height)) diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index cafd03b..b1ca28c 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -132,7 +132,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): icon_name = fallback_name icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, icon_name) - if not (os.path.isfile(icon_file) or os.path.islink(icon_file)): + if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))): icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, fallback_name) img = wx.Image(icon_file) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-243-gf8fc633
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via f8fc633098b1c35bbcce8b2be0a63a2ef5ecc439 (commit) from a4d4405105bf3221aa6abca05fc92862527b802a (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 ----------------------------------------------------------------- commit f8fc633098b1c35bbcce8b2be0a63a2ef5ecc439 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 09:19:41 2012 +0200 one more security check on splash image detection ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/splash.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index d1b9ebc..af35bab 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -37,7 +37,7 @@ import basepath class PyHocaGUI_SplashScreen(wx.SplashScreen): def __init__(self, splash_image=None): - if os.path.basename(splash_image) == splash_image: + if splash_image and os.path.basename(splash_image) == splash_image: splash_image = os.path.join(basepath.images_basepath, splash_image) if not os.path.isfile(splash_image): 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-235-g91247a4
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via 91247a4fd865197fa21c2978689ba17c3171644d (commit) from a27e513e6be7af2726231a6b7e52ca8dc0872e44 (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 ----------------------------------------------------------------- commit 91247a4fd865197fa21c2978689ba17c3171644d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 09:18:08 2012 +0200 missing colons (typos) ----------------------------------------------------------------------- Summary of changes: x2go/cache.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/cache.py b/x2go/cache.py index 5a2b2f9..1e8c38f 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -152,7 +152,7 @@ class X2goListSessionsCache(object): for session_name in self.x2go_listsessions_cache[profile_name]['sessions']: self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name)) except x2go_exceptions.X2goControlSessionException, e: - if profile_name in self.x2go_listsessions_cache.keys() + if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] raise e @@ -167,7 +167,7 @@ class X2goListSessionsCache(object): try: self.x2go_listsessions_cache[profile_name]['desktops'] = control_session.list_desktops() except x2go_exceptions.X2goControlSessionException, e: - if profile_name in self.x2go_listsessions_cache.keys() + if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] raise e @@ -183,7 +183,7 @@ class X2goListSessionsCache(object): if control_session is not None: self.x2go_listsessions_cache[profile_name]['sessions'] = control_session.list_sessions() except x2go_exceptions.X2goControlSessionException, e: - if profile_name in self.x2go_listsessions_cache.keys() + if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] raise e hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-234-ga27e513
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via a27e513e6be7af2726231a6b7e52ca8dc0872e44 (commit) from 18c58ed55e34f187de88f584635e5fe2758f5003 (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 ----------------------------------------------------------------- commit a27e513e6be7af2726231a6b7e52ca8dc0872e44 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 09:16:52 2012 +0200 minor change in listsessions cache ----------------------------------------------------------------------- Summary of changes: x2go/cache.py | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/x2go/cache.py b/x2go/cache.py index a67b347..5a2b2f9 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -152,10 +152,8 @@ class X2goListSessionsCache(object): for session_name in self.x2go_listsessions_cache[profile_name]['sessions']: self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name)) except x2go_exceptions.X2goControlSessionException, e: - try: + if profile_name in self.x2go_listsessions_cache.keys() del self.x2go_listsessions_cache[profile_name] - except KeyError: - pass raise e def _update_desktops(self, profile_name, control_session): @@ -169,10 +167,8 @@ class X2goListSessionsCache(object): try: self.x2go_listsessions_cache[profile_name]['desktops'] = control_session.list_desktops() except x2go_exceptions.X2goControlSessionException, e: - try: + if profile_name in self.x2go_listsessions_cache.keys() del self.x2go_listsessions_cache[profile_name] - except KeyError: - pass raise e def _update_sessions(self, profile_name, control_session): @@ -187,10 +183,8 @@ class X2goListSessionsCache(object): if control_session is not None: self.x2go_listsessions_cache[profile_name]['sessions'] = control_session.list_sessions() except x2go_exceptions.X2goControlSessionException, e: - try: + if profile_name in self.x2go_listsessions_cache.keys() del self.x2go_listsessions_cache[profile_name] - except KeyError: - pass raise e def list_sessions(self, session_uuid): hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-242-ga4d4405
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via a4d4405105bf3221aa6abca05fc92862527b802a (commit) via ebe0667c3c2a115e5dbdb7b1d08152c166b871a8 (commit) from 6aa2c64cfd794a492ff85a4e52c3cee58b1175eb (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 ----------------------------------------------------------------- commit a4d4405105bf3221aa6abca05fc92862527b802a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 08:55:44 2012 +0200 fix for last commit commit ebe0667c3c2a115e5dbdb7b1d08152c166b871a8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 08:50:19 2012 +0200 Do not crash if a provided system tray icon cannot be found. Use a fallback icon instead. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/taskbar.py | 34 +++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6a933a3..e46a53e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -130,6 +130,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low that gets shown during application startup. - Only show splash if the splash image file does exist. - Fallback to default splash image if the custom splash does not exist. + - Do not crash if a provided system tray icon cannot be found. Use a + fallback icon instead. * 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/taskbar.py b/pyhoca/wxgui/taskbar.py index 5aa0a4f..cafd03b 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -73,24 +73,23 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): self.tooltip = "" def SetIconConnecting(self, profile_name): - self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') if x2go.X2GOCLIENT_OS == 'Windows': - icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu' - self.icon = self.MakeIcon(icon_name=icon_name) + icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon + self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='x2go-logo-ubuntu') self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to ,,%s\'\'") % profile_name) else: - icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'pyhoca-trayicon' - self.icon = self.MakeIcon(icon_name=icon_name) + icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon + self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name) def SetIconIdle(self): if x2go.X2GOCLIENT_OS == 'Windows': - icon_name = self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu' - self.icon = self.MakeIcon(icon_name=icon_name) + icon_name = self._PyHocaGUI.tray_icon + self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='x2go-logo-ubuntu') self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2Go...")) else: - icon_name = self._PyHocaGUI.tray_icon or 'pyhoca-trayicon' - self.icon = self.MakeIcon(icon_name=icon_name) + icon_name = self._PyHocaGUI.tray_icon + self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server")) def CreateSessionManagerPopupMenu(self, evt): @@ -117,17 +116,26 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): self.menu_optionsmanager = self.PopupMenu(menus_taskbar.PyHocaGUI_Menu_TaskbarOptionsManager(self._PyHocaGUI, caller=self,)) return self.menu_optionsmanager - def MakeIcon(self, icon_name): + def MakeIcon(self, icon_name, fallback_name='pyhoca-trayicon'): """\ The various platforms have different requirements for the icon size... """ if "wxMSW" in wx.PlatformInfo: - img = wx.Image('%s/PyHoca/16x16/%s.png' % (_icons_location, icon_name)) + icon_size = '16x16' elif "wxGTK" in wx.PlatformInfo: - img = wx.Image('%s/PyHoca/22x22/%s.png' % (_icons_location, icon_name)) + icon_size = '22x22' elif "wxMAC" in wx.PlatformInfo: - img = wx.Image('%s/PyHoca/128x128/%s.png' % (_icons_location, icon_name)) + icon_size = '128x128' + + if icon_name is None: + icon_name = fallback_name + + icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, icon_name) + if not (os.path.isfile(icon_file) or os.path.islink(icon_file)): + icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, fallback_name) + + img = wx.Image(icon_file) icon = wx.IconFromBitmap(img.ConvertToBitmap()) return icon 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-240-g6aa2c64
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via 6aa2c64cfd794a492ff85a4e52c3cee58b1175eb (commit) from d244082e8fd6fac9818a79b917885cb0263535ad (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 ----------------------------------------------------------------- commit 6aa2c64cfd794a492ff85a4e52c3cee58b1175eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 08:33:13 2012 +0200 Fallback to default splash image if the custom splash does not exist. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/splash.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d5acf6d..6a933a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -129,6 +129,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Add option --splash-image that allows to name a custom splash image that gets shown during application startup. - Only show splash if the splash image file does exist. + - Fallback to default splash image if the custom splash does not exist. * 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/splash.py b/pyhoca/wxgui/splash.py index 1c892c9..d1b9ebc 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -37,12 +37,15 @@ import basepath class PyHocaGUI_SplashScreen(wx.SplashScreen): def __init__(self, splash_image=None): - if splash_image is None: - splash_image = 'pyhoca-splash.png' - if os.path.basename(splash_image) == splash_image: splash_image = os.path.join(basepath.images_basepath, splash_image) + if not os.path.isfile(splash_image): + splash_image = None + + if splash_image is None: + splash_image = os.path.join(basepath.images_basepath, 'pyhoca-splash.png') + if os.path.isfile(splash_image): splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, ) splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height)) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-239-gd244082
by git-admin＠x2go.org 15 May '12

15 May '12

The branch, master has been updated via d244082e8fd6fac9818a79b917885cb0263535ad (commit) from 03afe04286a88a0e24a540cdc39feab3a9705124 (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 ----------------------------------------------------------------- commit d244082e8fd6fac9818a79b917885cb0263535ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 15 08:24:30 2012 +0200 Only show splash if the splash image file does exist. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/splash.py | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1c7abfb..d5acf6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -128,6 +128,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low system tray icon (e.g. for branding). - Add option --splash-image that allows to name a custom splash image that gets shown during application startup. + - Only show splash if the splash image file does exist. * 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/splash.py b/pyhoca/wxgui/splash.py index dda5aaa..1c892c9 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -43,18 +43,19 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen): if os.path.basename(splash_image) == splash_image: splash_image = os.path.join(basepath.images_basepath, splash_image) - splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, ) - splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height)) + if os.path.isfile(splash_image): + splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, ) + splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height)) - splash_wxbitmap = splash_wximage.ConvertToBitmap() - wx.SplashScreen.__init__(self, - splash_wxbitmap, - splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT, - milliseconds=5000, - parent=None, - style=wx.SIMPLE_BORDER|wx.STAY_ON_TOP|wx.FRAME_NO_TASKBAR - ) - self.Bind(wx.EVT_CLOSE, self.OnClose) + splash_wxbitmap = splash_wximage.ConvertToBitmap() + wx.SplashScreen.__init__(self, + splash_wxbitmap, + splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT, + milliseconds=5000, + parent=None, + style=wx.SIMPLE_BORDER|wx.STAY_ON_TOP|wx.FRAME_NO_TASKBAR + ) + self.Bind(wx.EVT_CLOSE, self.OnClose) def OnClose(self, evt): # Make sure the default handler runs too so this window gets 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)).

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-15-g147d22c
by git-admin＠x2go.org 14 May '12

14 May '12

The branch, master has been updated via 147d22c44167b9b2d4afbdaf17262555a7af713b (commit) from ea355064c9a388987117c8765501be55061e47c9 (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 ----------------------------------------------------------------- commit 147d22c44167b9b2d4afbdaf17262555a7af713b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 12:56:29 2012 +0200 Use ,,-nolisten tcp'' option when evoking x2goagent from within x2gostartagent. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f07404d..967131b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low translated into an executable command by x2goruncommand. - Detect desktop session mode to use for Ubuntu precise and later. - Complete UNITY/GNOME support for Ubuntu/Debian. + - Use ,,-nolisten tcp'' option when evoking x2goagent from within + x2gostartagent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 739a0c2..29d0302 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -246,9 +246,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & else - x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & fi hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

nx-libs.git - null-source-drawable (branch) created: redist-server/3.5.0.13-2-ge604911
by git-admin＠x2go.org 14 May '12

14 May '12

The branch, null-source-drawable has been created at e6049116e11268aa958f95f232ae8d3bf1f5a3b6 (commit) - Log ----------------------------------------------------------------- commit e6049116e11268aa958f95f232ae8d3bf1f5a3b6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 09:56:11 2012 +0200 trying to fix null source drawable patch ----------------------------------------------------------------------- hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2012