diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 22:41:11 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 22:41:11 +0000 |
| commit | d919d22f89c1973a67d39e5ef9c4e754897e77a6 (patch) | |
| tree | ddde7db6a3ee8917d9231ff2b8592bd3c3966d48 /remoting | |
| parent | 9ae72621d8692938b1ce3e0a868cdf542a3076c2 (diff) | |
| download | chromium_src-d919d22f89c1973a67d39e5ef9c4e754897e77a6.zip chromium_src-d919d22f89c1973a67d39e5ef9c4e754897e77a6.tar.gz chromium_src-d919d22f89c1973a67d39e5ef9c4e754897e77a6.tar.bz2 | |
Chromoting Host: Initialize clipboard_atom_ before using it.
We weren't seeing XFixes CLIPBOARD selection changes, because we
requested notification before initializing |clipboard_atom_| !
BUG=166203
Review URL: https://chromiumcodereview.appspot.com/11575047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/linux/x_server_clipboard.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/linux/x_server_clipboard.cc b/remoting/host/linux/x_server_clipboard.cc index e63e5a0..b4e7d63 100644 --- a/remoting/host/linux/x_server_clipboard.cc +++ b/remoting/host/linux/x_server_clipboard.cc @@ -54,11 +54,6 @@ void XServerClipboard::Init(Display* display, 0, 0, 1, 1, // x, y, width, height 0, 0, 0); - XFixesSelectSelectionInput(display_, clipboard_window_, XA_PRIMARY, - XFixesSetSelectionOwnerNotifyMask); - XFixesSelectSelectionInput(display_, clipboard_window_, clipboard_atom_, - XFixesSetSelectionOwnerNotifyMask); - // TODO(lambroslambrou): Use ui::X11AtomCache for this, either by adding a // dependency on ui/ or by moving X11AtomCache to base/. static const char* const kAtomNames[] = { @@ -84,6 +79,11 @@ void XServerClipboard::Init(Display* display, } else { LOG(ERROR) << "XInternAtoms failed"; } + + XFixesSelectSelectionInput(display_, clipboard_window_, XA_PRIMARY, + XFixesSetSelectionOwnerNotifyMask); + XFixesSelectSelectionInput(display_, clipboard_window_, clipboard_atom_, + XFixesSetSelectionOwnerNotifyMask); } void XServerClipboard::SetClipboard(const std::string& mime_type, |