summaryrefslogtreecommitdiff
path: root/gtk/gtkselection.c
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2014-08-20 21:35:02 +0200
committerCarlos Garnacho <carlosg@gnome.org>2014-09-01 19:17:53 +0200
commitbd410421d8f97bc8c3c984aa69b693d8415b3052 (patch)
tree897dc55a358d4c850d81d6ebf7463be8bdef7747 /gtk/gtkselection.c
parent5fcf2de61755e9c1563ac2ad8ac0442467f1117c (diff)
downloadgtk+-bd410421d8f97bc8c3c984aa69b693d8415b3052.tar.gz
gtkselection: Ensure the X11 specific message length only applies to X11
Other backends are compilable together with the X11 one, so the message lenght limit was applying to them all. https://bugzilla.gnome.org/show_bug.cgi?id=697855
Diffstat (limited to 'gtk/gtkselection.c')
-rw-r--r--gtk/gtkselection.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 1206b6827e..bd9d22b0d5 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -104,10 +104,12 @@
our buffers */
#ifdef GDK_WINDOWING_X11
#define GTK_SELECTION_MAX_SIZE(display) \
+ GDK_IS_X11_DISPLAY (display) ? \
MIN(262144, \
XExtendedMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) == 0 \
? XMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) - 100 \
- : XExtendedMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) - 100)
+ : XExtendedMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) - 100)\
+ : G_MAXINT
#else
/* No chunks on Win32 */
#define GTK_SELECTION_MAX_SIZE(display) G_MAXINT