diff options
| author | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
| commit | 0cb19c0a597bfb7a6cac416fb5c0b0a89043081e (patch) | |
| tree | 1c076c798ae6ce960bccde2e0aea675143d961d8 /misc | |
| parent | Fix SIGSEGV-generating lookup bug when incoming multicast transfers are retried (diff) | |
| parent | [PVSGUI] parsing cmdargs fixed (diff) | |
| download | pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.gz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.xz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.zip | |
Merge remote branch 'openslx/master' into mcastft
Conflicts:
CMakeLists.txt
pvsmgr.qrc
src/gui/clientConfigDialog.cpp
src/gui/mainWindow.cpp
src/gui/ui/mainwindow.ui
src/gui/ui/mainwindowtouch.ui
src/pvs.cpp
src/pvs.h
src/pvsDaemon.cpp
src/pvsgui.cpp
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/pvs.conf | 17 | ||||
| -rw-r--r-- | misc/pvsgui.conf | 3 | ||||
| -rw-r--r-- | misc/pvsgui.desktop | 4 | ||||
| -rw-r--r-- | misc/pvsmgr.conf | 12 |
4 files changed, 15 insertions, 21 deletions
diff --git a/misc/pvs.conf b/misc/pvs.conf index a6fe1f0..93c4ac5 100644 --- a/misc/pvs.conf +++ b/misc/pvs.conf @@ -1,10 +1,9 @@ -[General] -chatstate=on -chatmode=community -VNCPermit= +[VNC] +script=/usr/local/bin/pvs-vncsrv + +[Permissions] +vnc_lecturer=ro +vnc_other=no +allow_chat=T +allow_filetransfer=T -[room] -room=2 -background= -clientorder= -tag= diff --git a/misc/pvsgui.conf b/misc/pvsgui.conf new file mode 100644 index 0000000..9725bf5 --- /dev/null +++ b/misc/pvsgui.conf @@ -0,0 +1,3 @@ +[Display] +location=1 + diff --git a/misc/pvsgui.desktop b/misc/pvsgui.desktop new file mode 100644 index 0000000..676248d --- /dev/null +++ b/misc/pvsgui.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Exec=/usr/local/bin/pvsgui +Type=Application +Name=pvsgui diff --git a/misc/pvsmgr.conf b/misc/pvsmgr.conf index 3ff7b40..e69de29 100644 --- a/misc/pvsmgr.conf +++ b/misc/pvsmgr.conf @@ -1,12 +0,0 @@ -[Chat] -chatstate=on -chatmode=bossmode - -[Room] -roomId=123 - -[VNC] -quality=high - -[General] -chatmode=private |