x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

nx-libs.git - master (branch) updated: redist-client/3.5.0.20-4-gfc118b4
by git-admin＠x2go.org 06 May '13

06 May '13

The branch, master has been updated via fc118b4bbb02dd9994c266c74772216084dab705 (commit) from d8a55d2c604a770133dcb0216f5d6fd7d087c2a3 (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 fc118b4bbb02dd9994c266c74772216084dab705 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 6 22:44:32 2013 +0200 add forgotten file: debian/keystrokes.cfg ----------------------------------------------------------------------- Summary of changes: debian/keystrokes.cfg | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 debian/keystrokes.cfg The diff of changes is: diff --git a/debian/keystrokes.cfg b/debian/keystrokes.cfg new file mode 100644 index 0000000..734293a --- /dev/null +++ b/debian/keystrokes.cfg @@ -0,0 +1,11 @@ +<!DOCTYPE NXKeystroke> +<keystrokes> +<keystroke action="fullscreen" AltMeta="1" Control="1" key="b" /> +<keystroke action="minimize" AltMeta="1" Control="1" key="space" /> +<keystroke action="minimize" key="Escape" Shift="1" /> +<keystroke action="close_session" key="F7" /> +<keystroke action="fullscreen" key="F7" Mod1="1" /> +<keystroke action="fullscreen" key="F6" Mod1="1" /> +<keystroke action="force_synchronization" key="f" /> +<keystroke action="fullscreen" key="space" Mod1="0" Mod2="0" Control="0" Shift="0" AltMeta="0" /> +</keystrokes> 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

nx-libs.git - master (branch) updated: redist-client/3.5.0.20-3-gd8a55d2
by git-admin＠x2go.org 06 May '13

06 May '13

The branch, master has been updated via d8a55d2c604a770133dcb0216f5d6fd7d087c2a3 (commit) from dc5faf7afc6ac120e909c18203dd74a393fdaa2a (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 d8a55d2c604a770133dcb0216f5d6fd7d087c2a3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 6 22:38:51 2013 +0200 Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199). ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 7 +++++++ debian/changelog | 3 ++- debian/nxagent.install | 3 ++- debian/roll-tarballs.sh | 4 ++++ debian/rules | 2 ++ debian/x2goagent.install | 1 + 6 files changed, 18 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 02e7d12..3083a08 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -7,6 +7,8 @@ COPY_SYMLINK=cp -a RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty +ETCDIR_NX ?= /etc/nx +ETCDIR_X2GO ?= /etc/x2go PREFIX ?= /usr/local BINDIR=$(PREFIX)/bin NXLIBDIR=$(PREFIX)/lib/nx @@ -127,6 +129,11 @@ install-full: $(INSTALL_FILE) nx-X11/extras/Mesa/include/GLES/*.h \ $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/ + $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX) + $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO) + $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/ + $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_X2GO)/ + uninstall: $(MAKE) uninstall-lite [ ! -d nx-X11 ] || $(MAKE) uninstall-full diff --git a/debian/changelog b/debian/changelog index b195530..c25941e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low - * Continue development... + * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go + (for x2goagent). (Fixes: #199). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Mar 2013 21:07:42 +0100 diff --git a/debian/nxagent.install b/debian/nxagent.install index 6d1e230..3b81cf0 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -2,4 +2,5 @@ nx-X11/programs/Xserver/nxagent usr/lib/nx/bin bin/nxagent usr/bin debian/rgb usr/share/nx debian/nxagent.keyboard etc/nxagent -nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps \ No newline at end of file +nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps +etc/nx/keystrokes.cfg diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 57b3aad..2dc1c89 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -122,6 +122,10 @@ mv -v debian/changelog doc/changelog test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh +# provide a default keystrokes.cfg file +mkdir -p etc +test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg + # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" diff --git a/debian/rules b/debian/rules index 732f2e6..ac9f306 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,8 @@ override_dh_auto_build: ln -s debian/Makefile.nx-libs Makefile ln -s debian/Makefile.replace.sh replace.sh ln -s debian/wrappers bin + mkdir -p etc/ + ln -s debian/keystrokes.cfg etc/keystrokes.cfg ln -s debian/rgb ln -s debian/VERSION.x2goagent LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel diff --git a/debian/x2goagent.install b/debian/x2goagent.install index 72058a9..adcc160 100644 --- a/debian/x2goagent.install +++ b/debian/x2goagent.install @@ -3,3 +3,4 @@ usr/lib/x2go/bin/x2goagent usr/share/pixmaps/x2go.xpm usr/share/x2go/rgb usr/share/x2go/versions/VERSION.x2goagent +etc/x2go/keystrokes.cfg \ No newline at end of file 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

x2gobroker.git - master (branch) updated: 0.0.2.0-1-ga40d31f
by git-admin＠x2go.org 01 May '13

01 May '13

The branch, master has been updated via a40d31fd015bb02c750866712b20574723cc3978 (commit) from 363a8fb21e215d403ef81c9bfc0d079d431bacce (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 a40d31fd015bb02c750866712b20574723cc3978 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 1 21:10:03 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5e6f6ae..6aa021a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 + x2gobroker (0.0.2.0-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.0): diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index ff47173..2308a72 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.1.2' +__VERSION__ = '0.0.2.1' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index 8da3542..d5c3162 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.1.2' +__VERSION__ = '0.0.2.1' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.0-2-ga43eae3
by git-admin＠x2go.org 01 May '13

01 May '13

The branch, master has been updated via a43eae3a35698c7e8f39a6a70fb159bfbaea3f61 (commit) from a40d31fd015bb02c750866712b20574723cc3978 (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 a43eae3a35698c7e8f39a6a70fb159bfbaea3f61 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 1 21:11:18 2013 +0200 Remove trainling slashes from ManagementServer URLs. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2gobroker/uccsjson.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6aa021a..aa10d08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.2.0): + - Remove trainling slashes from ManagementServer URLs. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index 8393a59..757dc67 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -49,6 +49,7 @@ class ManagementServer(): self.RemoteDesktopServers = [] self.AdditionalManagementServers = [] self.URL = unicode(url) + self.URL = '{url}/'.format(url=self.URL.rstrip('/')) self.Name = unicode(name) def set_default(self, ts_name): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

lightdm-remote-session-x2go.git - master (branch) updated: 0.0.1.0-3-g823327b
by git-admin＠x2go.org 01 May '13

01 May '13

The branch, master has been updated via 823327b8856f5f320469e8453565a5792143dcc2 (commit) from 4a54c473a0165924e463cc494e38df46c12c618b (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 823327b8856f5f320469e8453565a5792143dcc2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 1 10:06:47 2013 +0200 Another apparmor rule: allow rw access to /var/lib/libuuid/clock.txt". ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + lightdm-remote-session-x2go.in | 1 + 2 files changed, 2 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0e8bcdf..726c527 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ lightdm-remote-session-x2go (0.0.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.1.1): - Add apparmor rule that grants read access to the kernel's random UUID generator. + - Another apparmor rule: allow rw access to /var/lib/libuuid/clock.txt". -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Apr 2013 17:04:25 +0200 diff --git a/lightdm-remote-session-x2go.in b/lightdm-remote-session-x2go.in index 7998dd1..f10d5a8 100644 --- a/lightdm-remote-session-x2go.in +++ b/lightdm-remote-session-x2go.in @@ -62,6 +62,7 @@ /{,var/}run/shm/** wl, # access to kernel's UUID generator (required by pyhoca-cli) @{PROC}/sys/kernel/random/uuid r, + /var/lib/libuuid/clock.txt rw, capability ipc_lock, hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

libpam-x2go.git - master (branch) updated: 0.0.1.0-1-gf50fdee
by git-admin＠x2go.org 30 Apr '13

30 Apr '13

The branch, master has been updated via f50fdee7cbe0f8795ba61364c06be0c28314db7b (commit) from 7bd353381c728a0044e61763af2972041295fb51 (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 f50fdee7cbe0f8795ba61364c06be0c28314db7b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 30 17:40:42 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/configure.ac b/configure.ac index c08fa8b..78b4195 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libpam-x2go], [0.0.1.0]) +AC_INIT([libpam-x2go], [0.0.1.1]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([-Wno-portability]) diff --git a/debian/changelog b/debian/changelog index 7e8dba1..b7c9a34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libpam-x2go (0.0.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Apr 2013 17:40:29 +0200 + libpam-x2go (0.0.1.0-0~x2go1) unstable; urgency=low * New upstream version (0.0.1.0): hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) 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 "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

libpam-x2go.git - master (branch) updated: 0.0.1.0-2-g1087882
by git-admin＠x2go.org 30 Apr '13

30 Apr '13

The branch, master has been updated via 1087882065333ed4180bb7020465a7a132019a4c (commit) from f50fdee7cbe0f8795ba61364c06be0c28314db7b (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 1087882065333ed4180bb7020465a7a132019a4c Author: Jan Engelhardt <jengelh(a)inai.de> Date: Tue Apr 30 17:42:04 2013 +0200 Make building tests optional. (Fixes: #196). ----------------------------------------------------------------------- Summary of changes: Makefile.am | 8 +++++--- configure.ac | 3 ++- debian/changelog | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/Makefile.am b/Makefile.am index 9477c1c..7d71690 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ -SUBDIRS = \ - src \ - tests +SUBDIRS = src + +if HAVE_GTEST +SUBDIRS += tests +endif DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/configure.ac b/configure.ac index 78b4195..ba57d72 100644 --- a/configure.ac +++ b/configure.ac @@ -55,8 +55,9 @@ AC_SUBST(PAMMODULEDIR) m4_include([m4/gtest.m4]) CHECK_GTEST if test "x$have_gtest" != "xyes"; then - AC_MSG_ERROR([tests were requested but gtest is not installed.]) + AC_MSG_WARN([tests were requested but gtest is not installed.]) fi +AM_CONDITIONAL([HAVE_GTEST], [test "$have_gtest" != "no"]) ########################### # gcov coverage reporting diff --git a/debian/changelog b/debian/changelog index b7c9a34..ee0ba61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libpam-x2go (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Jan Engelhardt ] + * New upstream version (0.0.1.1): + - Make building tests optional. (Fixes: #196). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Apr 2013 17:40:29 +0200 hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) 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 "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

lightdm-remote-session-x2go.git - master (branch) updated: 0.0.1.0-2-g4a54c47
by git-admin＠x2go.org 30 Apr '13

30 Apr '13

The branch, master has been updated via 4a54c473a0165924e463cc494e38df46c12c618b (commit) from 9d7b238c08875d42071d51de697f5acec7cf89ba (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 4a54c473a0165924e463cc494e38df46c12c618b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 30 17:06:10 2013 +0200 Add apparmor rule that grants read access to the kernel's random UUID generator. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- lightdm-remote-session-x2go.in | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0434a9e..0e8bcdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ lightdm-remote-session-x2go (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.1.1): + - Add apparmor rule that grants read access to the kernel's random UUID + generator. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Apr 2013 17:04:25 +0200 diff --git a/lightdm-remote-session-x2go.in b/lightdm-remote-session-x2go.in index 6a105ca..7998dd1 100644 --- a/lightdm-remote-session-x2go.in +++ b/lightdm-remote-session-x2go.in @@ -60,6 +60,8 @@ # necessary for writing to sockets, etc. /{,var/}run/** rmkix, /{,var/}run/shm/** wl, + # access to kernel's UUID generator (required by pyhoca-cli) + @{PROC}/sys/kernel/random/uuid r, capability ipc_lock, hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - master (branch) updated: 0.0.1.0-1-g9d7b238
by git-admin＠x2go.org 30 Apr '13

30 Apr '13

The branch, master has been updated via 9d7b238c08875d42071d51de697f5acec7cf89ba (commit) from 5322edf855e89eb446ad3d619cb218e2a93be5ae (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 9d7b238c08875d42071d51de697f5acec7cf89ba Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 30 17:05:08 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/configure.ac b/configure.ac index 17df766..c6e68c3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lightdm-remote-session-x2go], [0.0.1.0]) +AC_INIT([lightdm-remote-session-x2go], [0.0.1.1]) AM_INIT_AUTOMAKE([1.11 -Wno-portability]) AM_SILENT_RULES([yes]) diff --git a/debian/changelog b/debian/changelog index baa702c..0434a9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lightdm-remote-session-x2go (0.0.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Apr 2013 17:04:25 +0200 + lightdm-remote-session-x2go (0.0.1.0-0~x2go1) unstable; urgency=low * New upstream version (0.0.1.0): hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.2-2-ge10c24c
by git-admin＠x2go.org 29 Apr '13

29 Apr '13

The branch, master has been updated via e10c24cf8733bec511fb7be8182bd0bb21394826 (commit) from bdfcaf307c52ef66b4faa1ef69b26d811b9c5ffe (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 e10c24cf8733bec511fb7be8182bd0bb21394826 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Apr 29 14:01:38 2013 +0200 On selecting »Unshare All Local Folders« purge all shares from the »export« session profile parameter if »restoreexports« is set to true in the session profile. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- debian/control | 2 +- pyhoca/wxgui/frontend.py | 2 ++ pyhoca/wxgui/menus_taskbar.py | 8 ++------ 4 files changed, 9 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0005b7b..50ca626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ pyhoca-gui (0.4.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.3): + - On selecting »Unshare All Local Folders« purge all shares from the + »export« session profile parameter if »restoreexports« is set to true + in the session profile. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 21 Apr 2013 23:09:12 +0200 diff --git a/debian/control b/debian/control index 1cfaf9a..060cabb 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.4.0.3-0~), + python-x2go (>=0.4.0.4-0~), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 4f49af5..f845672 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1229,6 +1229,8 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] self._X2GoClient__unshare_all_local_folders_from_profile(profile_name=profile_name) + if self._X2GoClient__get_profile_config(profile_name, 'restoreexports'): + self._X2GoClient__set_profile_config(profile_name, 'export', {}) def OnShareLocalFolder(self, evt): """\ diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 2d08231..831cc35 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -335,15 +335,11 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu): self.Append(id=ID_SHARECUSTOMLOCALFOLDER, text=_(u"&Share custom local folder")) self.AppendSeparator() + self._PyHocaGUI._eventid_unshared_folders_map={} _exported_folders = self._PyHocaGUI.get_profile_config(profile_name, 'export') _shared_folders = self._PyHocaGUI._X2GoClient__profile_get_shared_folders(profile_name=profile_name, check_list_mounts=True) or [] - - _sharable_folders = [] - for _folder_path in _exported_folders.keys(): - _sharable_folders.append(_folder_path) - - self._PyHocaGUI._eventid_unshared_folders_map={} + _sharable_folders = _exported_folders.keys() _unshared_folders = [ f for f in _sharable_folders if f and f not in _shared_folders ] if _unshared_folders: 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits