Jim Grandy
72ec05d37e
fix merge error in sesman/chansrv/clipboard.c
2013-08-22 13:50:04 -07:00
Jim Grandy
a308d2e25c
Fix errors cause by previous merge ( 2361914)
2013-08-22 12:57:00 -07:00
Jim Grandy
b7b3d9ef28
Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce
2013-08-22 12:56:51 -07:00
Jim Grandy
81d206ba68
Hand-apply patch (rail: send ShowState when window order changes) from Authentic8: c36a2d7
2013-08-22 12:52:32 -07:00
Jim Grandy
142a93829b
Hand-apply patches (chansrv/rail) from Authentic8: 516fd1d 6a4fb28 c038a99
2013-08-22 12:52:32 -07:00
Jim Grandy
9d4205ba7a
Hand-apply patch (chansrv: handle ReparentNotify) from Authentic8: 68cdc07
2013-08-22 12:52:31 -07:00
Jim Grandy
bd8083d7e2
Fix merge errors introduced in 3ae1b415 and 20ec9ee3
2013-08-22 12:52:31 -07:00
Jim Grandy
a32669f3ef
Hand-apply patches (rail) from Authentic8 branch: e94d059 c36dc61
2013-08-22 12:49:41 -07:00
Jim Grandy
173ed7056f
Hand-apply patches (rail) from Authentic8: b01207f b9807e9 42f0128 0f0750c aef2dce
2013-08-22 12:49:41 -07:00
Jim Grandy
af4e42a08d
Hand-apply patches (rail) from Authentic8: bc68076
2013-08-22 12:49:40 -07:00
Jim Grandy
2036010e0c
Hand-apply patches (rail improvements) from Authentic8 branch: 6d97878
2013-08-22 12:49:40 -07:00
Jim Grandy
53311f2b25
Hand-apply patches (rail improvements) from Authentic8 branch: 6e15b4a 2c99e69 3f30429 aad2aaa 4f8481e 5117ac2 f3dcf1a
2013-08-22 12:49:40 -07:00
Jim Grandy
dfe5911b55
Hand-apply patches (rail improvements) from Authentic8 branch: 507694d, 0e21d45, 44447d5, e452e4f, 3d05576, dd69d8f
2013-08-22 12:49:40 -07:00
Laxmikant Rashinkar
09dd58c5e1
clipboard: enabled module logging
2013-08-14 20:00:52 -07:00
Laxmikant Rashinkar
6381941c78
FUSE: changed architecture to use opendir/readdir instead of just readdir
2013-08-11 18:06:39 -07:00
Laxmikant Rashinkar
d2de1b703b
Merge branch 'master' of github.com:neutrinolabs/xrdp
2013-08-09 19:44:05 -07:00
Laxmikant Rashinkar
23433c9c7e
fuse: added support for detecting files/directories deleted locally
2013-08-09 19:43:45 -07:00
Jay Sorg
8b48e2274e
chansrv: work on smartcard
2013-08-05 20:16:18 -07:00
Jay Sorg
e427113fa8
chansrv: work on smartcard redir
2013-08-05 01:10:57 -07:00
Jay Sorg
2515caa66a
sesman: added a env var to know when xrdp session
2013-07-30 15:03:34 -07:00
Jay Sorg
17bf2abe30
xorg driver, include cleanup
2013-07-23 20:57:38 -07:00
Jay Sorg
45492057c5
Merge branch 'master' of github.com:neutrinolabs/xrdp
2013-07-02 00:45:54 -07:00
Jay Sorg
29420b3134
chansrv: no logic change, work on warning
2013-07-02 00:45:40 -07:00
speidy
aab0176867
chansrv: fix for pulse simple method, to get it work again.
2013-06-25 00:00:32 +03:00
Jay Sorg
0aa3dbe738
chansrv: no logic change, EOL and coding style cleanup
2013-06-23 14:17:59 -07:00
Lukas Vacek
1341e64062
Revert "Fix path to config.c in sesman/tools/Makefile.am"
...
This reverts commit a0f8afca50
2013-06-22 22:22:13 +01:00
Lukas Vacek
e7fe39a65b
Fix sound and clipboard crashes
...
- In case clipboard is not initialized, clipboard_data_in returns
(fixes a segfault)
- If less than 4 bytes are sent to sound_send_wave_data_chunk, it
returns
(fixes a segfault)
- When sending sound initiliazation messages set g_chan in chansrv to 0,
so the server waits for client to reply (this makes sound work afte
reconnecting)
- In process_message_channel_setup, clear any leftover data in
chan_items
2013-06-22 21:57:16 +01:00
Lukas Vacek
a0f8afca50
Fix path to config.c in sesman/tools/Makefile.am
2013-06-22 21:26:29 +01:00
Jay Sorg
c20b447f21
sesman: pid string match xrdp length
2013-06-19 11:43:24 -07:00
Jay Sorg
a6592ed690
sesman: fix for reading pid file
2013-06-19 11:37:26 -07:00
Laxmikant Rashinkar
78498f6682
Merge branch 'master' of github.com:neutrinolabs/xrdp
2013-06-08 18:44:34 -07:00
Laxmikant Rashinkar
6ad1d7f78d
folder redirection: fixed language issues
2013-06-08 18:44:21 -07:00
Jay Sorg
c6fa03102f
copyright year update
2013-06-08 10:51:53 -07:00
Jay Sorg
b4ff5e1d88
Merge remote-tracking branch 'xrdp-org/master'
2013-06-06 11:08:04 -07:00
Jay Sorg
5098f8b0fe
pulse: change some errors to debug
2013-06-06 11:05:39 -07:00
Jay Sorg
1b8b5daab5
more pulse notes
2013-06-06 10:57:17 -07:00
Jay Sorg
5223d1078f
Merge remote branch 'xrdp-org/master'
2013-06-03 00:04:49 -07:00
Laxmikant Rashinkar
2029867510
folder redirection: made changes to read/write routines to avoid race conditions
2013-06-02 15:33:51 -07:00
Jay Sorg
9c3635fa5e
startwm.sh add back startup logic
2013-05-29 01:01:27 -07:00
Jay Sorg
d4d6a65adb
merge from pmhahn
2013-05-29 00:11:14 -07:00
Jay Sorg
62a4403dd4
sesman: cleanup, close xrdp to sesman socket listener when starting a session / forking
2013-05-28 11:54:44 -07:00
Jay Sorg
75f4c3ca58
sesman: cleanup, close xrdp to sesman socket when starting a session / forking
2013-05-28 10:44:04 -07:00
Laxmikant Rashinkar
652bacf07f
file system redirection:
...
o vi now works with freerdp and rdesktop
2013-05-21 12:57:06 -07:00
Laxmikant Rashinkar
0f15c482e1
file system redirection:
...
o vi now works when connected via freerdp but does not fully work with rdesktop
2013-05-19 17:23:18 -07:00
Laxmikant Rashinkar
315ef8ad71
file system redirection:
...
o touch <file> was not working - fixed
o echo "this is a string" > filename was not working - fixed
o echo "this is a string" >> filename was not working - fixed
o vi was not working - working now but swap files are not
being deleted automatically - work in progress
2013-05-18 19:44:16 -07:00
Laxmikant Rashinkar
262bb7e813
Merge branch 'xrdp_smartcard'
2013-05-15 17:08:10 -07:00
Laxmikant Rashinkar
89b7cd269e
smartcard: developer checkin for smartcard support
2013-05-15 17:06:05 -07:00
Jay Sorg
21df0406d7
pulse work and cleanup
2013-05-12 18:03:32 -07:00
Jay Sorg
8c9fe9452f
pulse sink changes
2013-05-11 19:36:12 -07:00
Jay Sorg
1f1e8a5159
startwm.sh: forgot to remove org Xsession call
2013-05-07 20:32:06 -07:00
