diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2011-05-07 06:33:57 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-05-07 06:33:57 +0400 |
commit | 46a9a9a1c144f56a00d58980b927327ad8ce85dd (patch) | |
tree | b8d93e9941e13cfc6b0b0273dc6d54532a3f22e6 /intern/ghost/intern/GHOST_SystemX11.cpp | |
parent | ba94834c2bb95368986d43c64cbbee8961c980d7 (diff) | |
parent | 770119d16f7dbee99a60d19540818892c970c4e2 (diff) |
Merging r36382 through r36528
Diffstat (limited to 'intern/ghost/intern/GHOST_SystemX11.cpp')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index e2ee7044392..378bc6b90be 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1485,10 +1485,8 @@ void GHOST_SystemX11::putClipboard(GHOST_TInt8 *buffer, bool selection) const txt_select_buffer = (char*) malloc(strlen(buffer)+1); strcpy(txt_select_buffer, buffer); } - + if (owner != m_window) fprintf(stderr, "failed to own primary\n"); } } - - |