diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 13:50:04 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 13:50:04 -0700 |
| commit | 72ec05d37edd9745c3c797a455fc7dc023ef61ce (patch) | |
| tree | 197439769e8222e26148a7e57f6958b280e34047 /sesman | |
| parent | 7566fbfefffba237e23cb32935fc59ff6103b5ff (diff) | |
| download | xrdp-proprietary-72ec05d37edd9745c3c797a455fc7dc023ef61ce.tar.gz xrdp-proprietary-72ec05d37edd9745c3c797a455fc7dc023ef61ce.zip | |
fix merge error in sesman/chansrv/clipboard.c
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/chansrv/clipboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c index b8a978a3..34b94b38 100644 --- a/sesman/chansrv/clipboard.c +++ b/sesman/chansrv/clipboard.c @@ -1870,7 +1870,7 @@ clipboard_event_selection_notify(XEvent *xevent) { log_debug("clipboard_event_selection_notify: wnd %p prop %s", lxevent->requestor, - get_atom_text(lxevent->property))); + get_atom_text(lxevent->property)); rv = clipboard_get_window_property(lxevent->requestor, lxevent->property, &type, &fmt, &n_items, &data, &data_size); @@ -1889,7 +1889,7 @@ clipboard_event_selection_notify(XEvent *xevent) log_debug("clipboard_event_selection_notify: type is INCR " "data_size %d property name %s type %s", data_size, get_atom_text(lxevent->property), - get_atom_text(lxevent->type))); + get_atom_text(lxevent->type)); g_clip_s2c.incr_in_progress = 1; g_clip_s2c.property = lxevent->property; g_clip_s2c.type = lxevent->target; @@ -2138,7 +2138,7 @@ clipboard_event_selection_request(XEvent *xevent) ".requestor %d .owner %d .selection %d '%s' .target %d .property %d", g_wnd, lxev->requestor, lxev->owner, lxev->selection, get_atom_text(lxev->selection), - lxev->target, lxev->property)); + lxev->target, lxev->property); if (lxev->property == None) { @@ -2324,7 +2324,7 @@ clipboard_event_property_notify(XEvent *xevent) log_debug("clipboard_event_property_notify: PropertyNotify .window %d " ".state %d .atom %d %s", xevent->xproperty.window, xevent->xproperty.state, xevent->xproperty.atom, - get_atom_text(xevent->xproperty.atom))); + get_atom_text(xevent->xproperty.atom)); if (g_clip_c2s.incr_in_progress && (xevent->xproperty.window == g_clip_c2s.window) && |