diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-08-08 09:21:40 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:57:00 -0700 |
| commit | a308d2e25c4e566669b86312d1bcf8a32c3cca1f (patch) | |
| tree | 5e7811b4285194efcfaa27f8a936c7060810b084 /sesman | |
| parent | b7b3d9ef28e14e7e7ab20d74a71b1582bccf9430 (diff) | |
| download | xrdp-proprietary-a308d2e25c4e566669b86312d1bcf8a32c3cca1f.tar.gz xrdp-proprietary-a308d2e25c4e566669b86312d1bcf8a32c3cca1f.zip | |
Fix errors cause by previous merge (2361914)
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/chansrv/clipboard.c | 2 | ||||
| -rw-r--r-- | sesman/chansrv/rail.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c index 769fa814..b8a978a3 100644 --- a/sesman/chansrv/clipboard.c +++ b/sesman/chansrv/clipboard.c @@ -277,6 +277,8 @@ static int g_num_formatIds = 0; static int g_file_format_id = -1; +static char g_last_atom_name[256] = ""; + /*****************************************************************************/ static char* APP_CC get_atom_text(Atom atom) diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c index 10a67f07..3b8b2a0c 100644 --- a/sesman/chansrv/rail.c +++ b/sesman/chansrv/rail.c @@ -69,6 +69,8 @@ static Window g_focus_win = 0; static int g_xrr_event_base = 0; /* non zero means we got extension */ +static Cursor g_default_cursor = 0; + /* used in valid field of struct rail_window_data */ #define RWD_X (1 << 0) #define RWD_Y (1 << 1) |