x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

pyhoca-gui.git - master (branch) updated: 0.1.0.10-237-g9264eee
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via 9264eee6b541eea834b8f46aa975d465cc350f47 (commit) from e3d22dd947f9424598314f589c03ad4284fe3a6d (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 9264eee6b541eea834b8f46aa975d465cc350f47 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 14:46:33 2012 +0200 Add option --splash-image that allows to name a custom splash image that gets shown during application startup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca-gui | 1 + pyhoca/wxgui/frontend.py | 2 +- pyhoca/wxgui/splash.py | 16 +++++++++++++--- 4 files changed, 17 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f737d38..1c7abfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -126,6 +126,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Python gevent will drop gevent.dns in v1.0. Not using it anymore. - Add options --tray-icon and --tray-icon-connecting to customize the 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. * 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-gui b/pyhoca-gui index ae66833..f3c6b31 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -213,6 +213,7 @@ x2go_gui_options = [ {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended sessions on connect', }, {'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', }, {'args':['--disconnect-on-terminate'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been terminated', }, + {'args':['--splash-image'], 'default': None, 'metavar': '<your-splash-image>', 'help': 'define an alternative splash image that gets shown on application startup (PNG files only, full path or filename as found in <share>/img)', }, {'args':['--disable-splash'], 'default': False, 'action': 'store_true', 'help': 'disable the applications splash screen', }, {'args':['--disable-options'], 'default': False, 'action': 'store_true', 'help': 'disable the client options configuration window', }, {'args':['--disable-printingprefs'], 'default': False, 'action': 'store_true', 'help': 'disable the client\'s printing preferences window', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 972c03f..43518e2 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -181,7 +181,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): #SetExitHandler(self._exit_handler) if not self.args.disable_splash: - splash.PyHocaGUI_SplashScreen() + splash.PyHocaGUI_SplashScreen(splash_image=self.args.splash_image) self.Bind(wx.EVT_IDLE, self.OnIdle) diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index e18547c..dda5aaa 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -35,10 +35,20 @@ import os import basepath class PyHocaGUI_SplashScreen(wx.SplashScreen): - def __init__(self): - splash_bitmap = wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-splash.png'), wx.BITMAP_TYPE_PNG) + 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) + + 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_bitmap, + splash_wxbitmap, splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT, milliseconds=5000, parent=None, 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-236-ge3d22dd
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via e3d22dd947f9424598314f589c03ad4284fe3a6d (commit) from d3be56fe6794a891488320343db3cd34b8236b7e (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 e3d22dd947f9424598314f589c03ad4284fe3a6d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 14:19:10 2012 +0200 Add options --tray-icon and --tray-icon-connecting to customize the system tray icon (e.g. for branding). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca-gui | 2 ++ pyhoca/wxgui/frontend.py | 2 ++ pyhoca/wxgui/taskbar.py | 12 ++++++++---- 4 files changed, 14 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fa0216b..f737d38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -124,6 +124,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Windows packaging: remove dist directory before calling py2exe. - For empty menu maps create a dummy menu. - Python gevent will drop gevent.dns in v1.0. Not using it anymore. + - Add options --tray-icon and --tray-icon-connecting to customize the + system tray icon (e.g. for branding). * 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-gui b/pyhoca-gui index 901fe24..ae66833 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -203,6 +203,8 @@ x2go_gui_options = [ {'args':['--auto-connect'], 'default': False, 'action': 'store_true', 'help': 'connect sessions via SSH pubkey authentication if possible', }, {'args':['--show-profile-metatypes'], 'default': False, 'action': 'store_true', 'help': 'show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging)', }, {'args':['--single-session-profile'], 'default': False, 'action': 'store_true', 'help': 'disable support of handling multiple session profiles', }, + {'args':['--tray-icon'], 'default': None, 'metavar': '<your-logo>', 'help': 'define an alternative system tray icon file (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, + {'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit', }, {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', }, {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index bff85d4..972c03f 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -234,6 +234,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.disconnect_on_terminate = self.args.disconnect_on_terminate self.show_profile_metatypes = self.args.show_profile_metatypes self.restricted_trayicon = self.args.restricted_trayicon + self.tray_icon = self.args.tray_icon + self.tray_icon_connecting = self.args.tray_icon_connecting self.disable_notifications = self.args.disable_notifications self.remember_username = self.args.remember_username diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 089b84d..5aa0a4f 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -75,18 +75,22 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): def SetIconConnecting(self, profile_name): self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') if x2go.X2GOCLIENT_OS == 'Windows': - self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu') + icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu' + self.icon = self.MakeIcon(icon_name=icon_name) self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to ,,%s\'\'") % profile_name) else: - self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') + icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'pyhoca-trayicon' + self.icon = self.MakeIcon(icon_name=icon_name) 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': - self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu') + icon_name = self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu' + self.icon = self.MakeIcon(icon_name=icon_name) self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2Go...")) else: - self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') + icon_name = self._PyHocaGUI.tray_icon or 'pyhoca-trayicon' + self.icon = self.MakeIcon(icon_name=icon_name) self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server")) def CreateSessionManagerPopupMenu(self, evt): 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

nx-libs.git - master (branch) updated: redist-client/3.5.0.12-5-g45311f7
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via 45311f783acad296d37a248fb2c702c578ac3059 (commit) from 4372dfa53207a3247b8c317392f2672191b54fdf (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 45311f783acad296d37a248fb2c702c578ac3059 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 12:48:36 2012 +0200 Add patch: 120_nxagent_libcairo-null-source-drawables.full.patch, solves crashes of GTK applications based on libcairo 1.12.1+. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 + ...agent_libcairo-null-source-drawables.full.patch | 130 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 136 insertions(+), 0 deletions(-) create mode 100644 debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index da4999c..143717e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ nx-libs (2:3.5.0.13-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * Let nxagent Debian package depend on xfonts-base. + [ Jim Burnes ] + * Add patch: 120_nxagent_libcairo-null-source-drawables.full.patch, solves + crashes of GTK applications based on libcairo 1.12.1+. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:01:21 +0100 nx-libs (2:3.5.0.12-0) unstable; urgency=low diff --git a/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch new file mode 100644 index 0000000..66af325 --- /dev/null +++ b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch @@ -0,0 +1,130 @@ +--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c +@@ -995,6 +995,36 @@ + #endif + } + ++ ++int nxagentShouldDeferComposite(PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst) ++{ ++ ++int drawableDst; ++int linkDeferred; ++int unSyncedSrcMask; ++ ++ drawableDst = ( nxagentRenderVersionMajor == 0 && ++ nxagentRenderVersionMinor == 8 && ++ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP ++ ); ++ ++ linkDeferred = ( nxagentOption(DeferLevel) >= 2 && ++ nxagentOption(LinkType) < LINK_TYPE_ADSL ++ ); ++ ++ unSyncedSrcMask = ( nxagentOption(DeferLevel) == 1 && ++ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && ++ ( ++ (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) || ++ ((pMask) && pMask -> pDrawable && (nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)) ++ ) ++ ); ++ ++ ++ return drawableDst || linkDeferred || unSyncedSrcMask; ++} ++ ++ + void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, + INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, + INT16 yDst, CARD16 width, CARD16 height) +@@ -1036,8 +1066,8 @@ + } + + #endif +- +- if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) ++ /* if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) */ ++ if (nxagentShouldDeferComposite(pSrc, pMask, pDst)) + { + pDstRegion = nxagentCreateRegion(pDst -> pDrawable, NULL, xDst, yDst, width, height); + +@@ -1095,7 +1125,8 @@ + } + } + +- if (pMask != NULL && pMask -> pDrawable != pSrc -> pDrawable && ++ if ((pMask) && (pMask->pDrawable) && ++ pMask -> pDrawable != pSrc -> pDrawable && + pMask -> pDrawable != pDst -> pDrawable) + { + nxagentSynchronizeShmPixmap(pMask -> pDrawable, xMask, yMask, width, height); +@@ -1259,7 +1290,7 @@ + * on the real X server. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p].\n", +@@ -1302,14 +1333,15 @@ + nxagentSynchronizeBox(pSrc -> pDrawable, &glyphBox, NEVER_BREAK); + } + +- if (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP) ++ if (pSrc -> pDrawable && (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP)) + { + nxagentIncreasePixmapUsageCounter((PixmapPtr) pSrc -> pDrawable); + } + } + +- if (pSrc -> pDrawable != pDst -> pDrawable && +- nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (pSrc -> pDrawable != pDst -> pDrawable && ++ nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentGlyphs: Synchronizing destination [%s] at [%p].\n", +@@ -1749,7 +1781,9 @@ + return; + } + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ /* the following blocks need fixing to ignore null values of pDrawable */ ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTrapezoids: Going to synchronize the source drawable at [%p].\n", +@@ -1843,7 +1877,9 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriangles: Going to synchronize the source drawable at [%p].\n", +@@ -1920,7 +1956,8 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriStrip: Going to synchronize the source drawable at [%p].\n", +@@ -1997,7 +2034,8 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriFan: Going to synchronize the source drawable at [%p].\n", diff --git a/debian/patches/series b/debian/patches/series index dc42d85..0e7726a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,6 +35,7 @@ 108_nxagent_wine-close-delay.full.patch 109_nxagent_locale-utf8-compound-text.full.patch 110_nxagent_createpixmap-bounds-check.full.patch +120_nxagent_libcairo-null-source-drawables.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.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

python-x2go.git - master (branch) updated: 0.1.1.4-233-g18c58ed
by git-admin＠x2go.org 08 May '12

08 May '12

The branch, master has been updated via 18c58ed55e34f187de88f584635e5fe2758f5003 (commit) from 3e00713c69fe2416045671bc3912216807fe86dc (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 18c58ed55e34f187de88f584635e5fe2758f5003 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 8 10:00:09 2012 +0200 Catch exceptions while calling SSH transport's getpeername() method. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 26 +++++++++++++++++++++----- x2go/backends/terminal/_stdout.py | 2 +- x2go/session.py | 4 +++- 4 files changed, 26 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 457c8a2..14dc935 100644 --- a/debian/changelog +++ b/debian/changelog @@ -122,6 +122,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Protect session cache from deletion while being processed. - 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. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index c727345..a5d08ba 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -170,7 +170,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): def _x2go_sftp_put(self, local_path, remote_path): - self.logger('sFTP-put: %s -> %s:%s' % (os.path.normpath(local_path), self.get_transport().getpeername(), remote_path), loglevel=log.loglevel_DEBUG) + self.logger('sFTP-put: %s -> %s:%s' % (os.path.normpath(local_path), self.remote_peername(), remote_path), loglevel=log.loglevel_DEBUG) try: self.sftp_client.put(os.path.normpath(local_path), remote_path) except x2go_exceptions.SSHException: @@ -179,18 +179,18 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): def _x2go_sftp_write(self, remote_path, content): - self.logger('sFTP-write: opening remote file %s on host %s for writing' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_DEBUG) + self.logger('sFTP-write: opening remote file %s on host %s for writing' % (remote_path, self.remote_peername()), loglevel=log.loglevel_DEBUG) try: remote_fileobj = self.sftp_client.open(remote_path, 'w') self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER) remote_fileobj.write(content) remote_fileobj.close() except x2go_exceptions.SSHException: - self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_WARN) + self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN) def _x2go_sftp_remove(self, remote_path): - self.logger('sFTP-write: removing remote file %s on host %s' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_DEBUG) + self.logger('sFTP-write: removing remote file %s on host %s' % (remote_path, self.remote_peername()), loglevel=log.loglevel_DEBUG) self.sftp_client.remove(remote_path) def _x2go_exec_command(self, cmd_line, loglevel=log.loglevel_INFO, timeout=20, **kwargs): @@ -307,7 +307,23 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ if self.get_transport() is not None: - return self.get_transport().get_username() + try: + return self.get_transport().get_username() + except: + raise x2go_exceptions.X2goControlSessionException('Lost connection to X2Go server') + else: + return None + + def remote_peername(self): + """\ + Returns the control session's remote host (name or ip). + + """ + if self.get_transport() is not None: + try: + return self.get_transport().getpeername() + except: + raise x2go_exceptions.X2goControlSessionException('Lost connection to X2Go server') else: return None diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 5ed8d83..c8a1ec1 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1159,7 +1159,7 @@ class X2goTerminalSessionSTDOUT(object): try: self.session_info.initialize(_stdout, username=self.control_session.remote_username(), - hostname=self.control_session.get_transport().getpeername(), + hostname=self.control_session.remote_peername(), ) except ValueError: raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session") diff --git a/x2go/session.py b/x2go/session.py index cede735..e22014d 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -721,8 +721,10 @@ class X2goSession(object): @rtype: C{tuple} """ - return self.control_session.get_transport().getpeername() + return self.control_session.remote_peername() __get_server_peername = get_server_peername + remote_peername = get_server_peername + __remote_peername = get_server_peername def get_server_hostname(self): """\ 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

x2godesktopsharing.git - master (branch) updated: 3.0.1.4-2-g6ffe45d
by git-admin＠x2go.org 08 May '12

08 May '12

The branch, master has been updated via 6ffe45d50b3dacb1725e90a985e1876a6ed44c16 (commit) from 3faf29061e1775e6a0fb5d68fa66e5d804d4e393 (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 6ffe45d50b3dacb1725e90a985e1876a6ed44c16 Author: Milan Knížek <knizek.confy(a)gmail.com> Date: Tue May 8 09:36:15 2012 +0200 Include <sys/unistd.h> in sharetray.cpp, fixes build on Ubuntu 12.10. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- sharetray.cpp | 1 + sharetray.h | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4fc14c3..c7b821a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2godesktopsharing (3.0.1.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Milan Knížek ] + * New upstream version (3.0.1.5): + - Include <sys/unistd.h> in sharetray.cpp, fixes build on Ubuntu 12.10. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:13:53 +0100 diff --git a/sharetray.cpp b/sharetray.cpp index a019cce..926a5ed 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -19,6 +19,7 @@ #include <QMessageBox> #include <QSocketNotifier> #include <sys/socket.h> +#include <sys/unistd.h> #include "simplelocalsocket.h" #include "accessaction.h" #include <sys/types.h> diff --git a/sharetray.h b/sharetray.h index 71c792a..bc4ec19 100644 --- a/sharetray.h +++ b/sharetray.h @@ -14,7 +14,6 @@ #include <QMainWindow> #include "ui_dlg.h" - class QMenu; class QLocalServer; class SimpleLocalSocket; hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2goclient.git - master (branch) updated: 3.99.2.0-10-g4f41b16
by git-admin＠x2go.org 07 May '12

07 May '12

The branch, master has been updated via 4f41b1600794e06c5a9ec5e14b1621c52f867ae0 (commit) from 8c41c073e281b7a7d6a876381096b45458748ec1 (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 4f41b1600794e06c5a9ec5e14b1621c52f867ae0 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Mon May 7 15:53:37 2012 +0200 command line options for username and autostart application ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ onmainwindow.cpp | 34 ++++++++++++++++++++++++++++++++-- onmainwindow.h | 2 ++ 3 files changed, 38 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a54b5c2..126827b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low - Support recent pulseuadio on windows - removing %USERPROFILE%\.x2go\pulse\.pulse\%COMPUTERNAME%-runtime\pid if exists under windows + - --user=<username> set username in session mode if this field is blank + in session settings. + - --autostart=<app> launch "app" by session start in "published + applications" mode [ Daniel Lindgren ] * New upstream version (3.99.2.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 6879c39..9a55755 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2581,6 +2581,9 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) userName=st.setting()->value ( sid+"/user", ( QVariant ) QString::null ).toString(); + if (defaultUser && userName.length()<1) + userName=defaultUserName; + sshPort=st.setting()->value ( sid+"/sshport", ( QVariant ) defaultSshPort ).toString(); @@ -3235,6 +3238,7 @@ void ONMainWindow::startNewSession() QString xdmcpServer; runRemoteCommand=true; QString host=QString::null; + runStartApp=true; removeAppsFromTray(); if ( useLdap ) { @@ -3545,6 +3549,7 @@ void ONMainWindow::startNewSession() void ONMainWindow::resumeSession ( const x2goSession& s ) { newSession=false; + runStartApp=false; applications.clear(); removeAppsFromTray(); QString passwd=getCurrentPass(); @@ -4991,9 +4996,13 @@ void ONMainWindow::slotProxyStderr() localGraphicPort+"' established" ) !=-1 ) { if ( newSession ) + { setStatStatus ( tr ( "starting" ) ); + } else + { setStatStatus ( tr ( "resuming" ) ); + } } if ( stInfo->toPlainText().indexOf ( @@ -5599,6 +5608,7 @@ void ONMainWindow::slotReadApplications(bool result, QString output, applications.clear(); QString locallong=QLocale::system().name(); QString localshort=QLocale::system().name().split("_")[0]; + bool startAppFound=false; foreach(QString appstr, output.split("</desktop>",QString::SkipEmptyParts)) { @@ -5625,6 +5635,8 @@ void ONMainWindow::slotReadApplications(bool result, QString output, if (line.indexOf("Name=")!=-1 && !localname) { app.name=line.split("=")[1]; + if (app.name==autostartApp) + startAppFound=true; // x2goDebug<<"name: "<<app.name<<endl; } if (line.indexOf("Comment=")!=-1 && !localcomment) @@ -5635,8 +5647,12 @@ void ONMainWindow::slotReadApplications(bool result, QString output, if (line.indexOf("Exec=")!=-1) { app.exec=line.split("=")[1]; + app.exec.replace(" %f","",Qt::CaseInsensitive); + app.exec.replace(" %u","",Qt::CaseInsensitive); app.exec.replace("%f","",Qt::CaseInsensitive); app.exec.replace("%u","",Qt::CaseInsensitive); + if (app.exec==autostartApp) + startAppFound=true; // x2goDebug<<"exec: "<<app.exec<<endl; } if (line.indexOf("Categories=")!=-1) @@ -5702,6 +5718,13 @@ void ONMainWindow::slotReadApplications(bool result, QString output, qSort(applications.begin(), applications.end(),Application::lessThen); plugAppsInTray(); + if (runStartApp && autostartApp.length()>1) + { + if (!startAppFound) + x2goDebug<<"Autostart application "<<autostartApp<< " not found in Desktop files"<<endl; + else + runApplication(autostartApp); + } } @@ -5921,6 +5944,11 @@ bool ONMainWindow::parseParameter ( QString param ) config.brokerName=value; return true; } + if ( setting == "--autostart") + { + autostartApp=value; + return true; + } if ( setting == "--auth-id") { QFile file(value); @@ -6230,7 +6258,7 @@ void ONMainWindow::showHelp() "default 22\n" "--command=<cmd>\t\t\t Set default command, default value 'KDE'\n" "--session=<session>\t\t Start session 'session'\n" - "--user=<username>\t\t in LDAP mode, select user 'username'\n" + "--user=<username>\t\t select user 'username'\n" "--geomerty=<W>x<H>|fullscreen\t set default geometry, default " "value '800x600'\n" "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default not set\n" @@ -6243,7 +6271,9 @@ void ONMainWindow::showHelp() "--kbd-type=<typed>\t\t set default keyboard type\n" "--home=<dir>\t\t\t set users home directory\n" "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n" - "--session-conf=<file>\t\t\t path to alternative session config\n"; + "--autostart=<app> \t\t launch \"app\" by session start in \"published " + "applications\" mode\n" + "--session-conf=<file>\t\t path to alternative session config\n"; qCritical ( "%s",helpMsg.toLocal8Bit().data() ); QMessageBox::information ( this,tr ( "Options" ),helpMsg ); } diff --git a/onmainwindow.h b/onmainwindow.h index 7e9cb94..66b21e8 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -506,6 +506,7 @@ private: bool embedMode; bool thinMode; QString statusString; + QString autostartApp; int defaultLink; int defaultQuality; int defaultWidth; @@ -664,6 +665,7 @@ private: bool showToolBar; bool showHaltBtn; bool newSession; + bool runStartApp; bool ldapOnly; bool isScDaemonOk; bool parecTunnelOk; hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

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

07 May '12

The branch, master has been updated via ea355064c9a388987117c8765501be55061e47c9 (commit) from 389c5d45a7b379904537016979b7232151484824 (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 ea355064c9a388987117c8765501be55061e47c9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 7 14:22:33 2012 +0200 further consolidation of x2goruncommand, cross-tested on Debian wheezy/sid, sid still fails to launch GNOME3 ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goruncommand | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 50965f1..541326d 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -93,25 +93,25 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then export DESKTOP_SESSION="gnome" elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^n.*" >/dev/null; then export DESKTOP_SESSION="2d-gnome" - args="--session=$DESKTOP_SESSION" + args=" --session=$DESKTOP_SESSION" elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then export DESKTOP_SESSION="gnome-fallback" - args="--session=$DESKTOP_SESSION" - elif [ cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then + args=" --session=$DESKTOP_SESSION" + elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" - elif [ cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; then + elif cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; then export DESKTOP_SESSION="gnome-fallback" - args="--session=$DESKTOP_SESSION" + args=" --session=$DESKTOP_SESSION" fi elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then export DESKTOP_SESSION="ubuntu-2d" - args="--session=$DESKTOP_SESSION" + args=" --session=$DESKTOP_SESSION" elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^n.*" >/dev/null; then export DESKTOP_SESSION="2d-ubuntu" - args="--session=$DESKTOP_SESSION" + args=" --session=$DESKTOP_SESSION" fi # on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell @@ -201,12 +201,12 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "running command $EXEC" x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ] && { - STARTUP="$cmd $args" + STARTUP="$cmd$args" $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\"" - /etc/x2go/Xsession "$STARTUP" + STARTUP="$STARTUP" /etc/x2go/Xsession } || { - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd $args\"..." - $cmd $args + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd$args\"..." + $cmd$args } #### some applications can quit immediately, we will wait here as long as x2goagent exists 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

x2goserver.git - master (branch) updated: 3.1.1.0-13-g389c5d4
by git-admin＠x2go.org 07 May '12

07 May '12

The branch, master has been updated via 389c5d45a7b379904537016979b7232151484824 (commit) from e07883826b637ad0d6d82db3d515d22b6e8d1481 (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 389c5d45a7b379904537016979b7232151484824 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 7 13:18:02 2012 +0200 Complete UNITY/GNOME support for Ubuntu/Debian. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goruncommand | 43 ++++++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 65019bb..f07404d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets 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. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b19abfb..50965f1 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -70,21 +70,50 @@ if [ -e "/etc/lsb-release" ]; then fi # let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) + +# NOTES on GNOME startup behaviour in different distributions +# =========================================================== + +# Debian launches GNOME3 (in accelerated mode) when calling gnome-session + +# Ubuntu launches Unity (in accelerated mode) when calling gnome-session. +# To make the GNOME variants start up properly on Debian/Ubuntu we have to make the following differentiations + +# before and with Ubuntu 10.10 (maverick): GNOME -> gnome-session (would start GNOME2) +# Ubuntu 11.04 (natty): GNOME -> gnome-session --session=2d-gnome, UNITY -> gnome-session --session=2d-ubuntu (GNOME3 based desktop shells) +# Ubuntu 11.10 (oneiric) or later: GNOME -> gnome-session --session=gnome-fallback, UNITY -> gnome-session --session=ubuntu-2d (GNOME3 based desktop shells) + +# before and with Debian squeeze: GNOME -> gnome-session (would start GNOME2) +# Debian wheezy: GNOME -> gnome-session --session=gnome-fallback, UNITY: not available (GNOME3 based desktop shells) + if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session --session=ubuntu-2d. - # GNOME (Ubuntu classic) gets launched when calling gnome-session --session=gnome-fallback. - - if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^[a-m].*" >/dev/null; then + export DESKTOP_SESSION="gnome" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^n.*" >/dev/null; then + export DESKTOP_SESSION="2d-gnome" + args="--session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then + export DESKTOP_SESSION="gnome-fallback" + args="--session=$DESKTOP_SESSION" + elif [ cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then + export DESKTOP_SESSION="gnome" + elif [ cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; then export DESKTOP_SESSION="gnome-fallback" args="--session=$DESKTOP_SESSION" fi -elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]) && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then +elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - export DESKTOP_SESSION="ubuntu-2d" - args="--session=$DESKTOP_SESSION" + if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then + export DESKTOP_SESSION="ubuntu-2d" + args="--session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^n.*" >/dev/null; then + export DESKTOP_SESSION="2d-ubuntu" + args="--session=$DESKTOP_SESSION" + fi + # on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" 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

x2goserver.git - master (branch) updated: 3.1.1.0-12-ge078838
by git-admin＠x2go.org 06 May '12

06 May '12

The branch, master has been updated via e07883826b637ad0d6d82db3d515d22b6e8d1481 (commit) from 22d7413c1ee6133326095ed344e0c47a391c4deb (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 e07883826b637ad0d6d82db3d515d22b6e8d1481 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 7 00:36:46 2012 +0200 Detect desktop session mode to use for Ubuntu precise and later. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +-- x2goserver/bin/x2goruncommand | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c1a6c95..65019bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - Add feature X2GO_SERVERSIDE_DESKTOPCOMMANDS. Let client provide a generic desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets translated into an executable command by x2goruncommand. - - Additionally to X2GO_SERVERSIDE_DESKTOPCOMMANDS allow rewriting of the - commands ,,gnome-session'' and ,,unity-2d-launcher'' in x2goruncommand. + - Detect desktop session mode to use for Ubuntu precise and later. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index ec202ee..b19abfb 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -35,6 +35,7 @@ export DISPLAY export X2GO_AGENT_PID export X2GO_SESSION cmd=`echo $cmd |sed 's/X2GO_SPACE_CHAR/ /g'` +args='' X2GO_ROOT="${HOME}/.x2go" MESSAGE_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput" @@ -71,16 +72,19 @@ fi # let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then - # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session. - # GNOME (Ubuntu classic) gets launched when calling gnome-session-fallback. + cmd="/usr/bin/gnome-session" + # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session --session=ubuntu-2d. + # GNOME (Ubuntu classic) gets launched when calling gnome-session --session=gnome-fallback. if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then - cmd="/usr/bin/gnome-session-fallback" - else - cmd="/usr/bin/gnome-session" + export DESKTOP_SESSION="gnome-fallback" + args="--session=$DESKTOP_SESSION" fi + elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]) && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then cmd="/usr/bin/gnome-session" + export DESKTOP_SESSION="ubuntu-2d" + args="--session=$DESKTOP_SESSION" elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" @@ -168,12 +172,12 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "running command $EXEC" x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ] && { - STARTUP=$cmd + STARTUP="$cmd $args" $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\"" - STARTUP="$STARTUP" /etc/x2go/Xsession + /etc/x2go/Xsession "$STARTUP" } || { - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command $EXEC..." - $cmd + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd $args\"..." + $cmd $args } #### some applications can quit immediately, we will wait here as long as x2goagent exists 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

python-x2go.git - master (branch) updated: 0.1.1.4-232-g3e00713
by git-admin＠x2go.org 06 May '12

06 May '12

The branch, master has been updated via 3e00713c69fe2416045671bc3912216807fe86dc (commit) from 203f5fe9543710232e8cfb894a25910d709afc09 (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 3e00713c69fe2416045671bc3912216807fe86dc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 6 23:32:22 2012 +0200 Ignore X windows with empty title while finding session window.. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/utils.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 400e537..457c8a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,6 +121,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Not using gevent to spawn MIME box default applications. - Protect session cache from deletion while being processed. - Adapt python-x2go to launching Unity-2d on Ubuntu precise. + - Ignore X windows with empty title while finding session window.. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/utils.py b/x2go/utils.py index cb8637a..f6894bb 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -488,7 +488,8 @@ def find_session_window(session_name): windowIDs = root.get_full_property(display.intern_atom('_NET_CLIENT_LIST'), Xlib.X.AnyPropertyType).value for windowID in windowIDs: window = display.create_resource_object('window', windowID) - if session_name in window.get_wm_name(): + name = window.get_wm_name() + if name is not None and session_name in name: success = True break 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits