summaryrefslogtreecommitdiffstats
path: root/patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch')
-rw-r--r--patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch b/patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch
new file mode 100644
index 000000000..41ac2c5e1
--- /dev/null
+++ b/patches/chromium/0011-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
+Date: Fri, 20 Sep 2013 15:01:41 +0200
+Subject: Hide the definition of MessagePumpGtk::GetDefaultXDisplay.
+
+---
+ base/message_loop/message_pump_gtk.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/base/message_loop/message_pump_gtk.cc b/base/message_loop/message_pump_gtk.cc
+index 86d2415..6023c11 100644
+--- a/base/message_loop/message_pump_gtk.cc
++++ b/base/message_loop/message_pump_gtk.cc
+@@ -79,6 +79,9 @@ void MessagePumpGtk::DispatchEvents(GdkEvent* event) {
+ DidProcessEvent(event);
+ }
+
++// FIXME: Get our own MessagePumpUI to avoid this.
++// Comment out this version so that our Qt version in shared_globals.cpp is used.
++/*
+ // static
+ Display* MessagePumpGtk::GetDefaultXDisplay() {
+ static GdkDisplay* display = gdk_display_get_default();
+@@ -90,6 +93,7 @@ Display* MessagePumpGtk::GetDefaultXDisplay() {
+ }
+ return GDK_DISPLAY_XDISPLAY(display);
+ }
++*/
+
+ void MessagePumpGtk::AddObserver(MessagePumpGdkObserver* observer) {
+ observers_.AddObserver(observer);