From 8f245aa1c469be664b0811d6353c34a431a4e00d Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sat, 23 Aug 2014 19:59:01 +0100
Subject: Fix gdk_display_get_n_screens deprecation

(bzr r13341.1.161)
---
 src/debug/log-display-config.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/debug')

diff --git a/src/debug/log-display-config.cpp b/src/debug/log-display-config.cpp
index 07380b3ad..ecc05b7b7 100644
--- a/src/debug/log-display-config.cpp
+++ b/src/debug/log-display-config.cpp
@@ -10,6 +10,7 @@
  */
 
 #include <iostream>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include "debug/event-tracker.h"
 #include "debug/logger.h"
@@ -58,11 +59,16 @@ public:
     Display() : ConfigurationEvent("display") {}
     void generateChildEvents() const {
         GdkDisplay *display=gdk_display_get_default();
+#if GTK_CHECK_VERSION(3,10,0)
+        GdkScreen *screen = gdk_display_get_screen(display, 0);
+        Logger::write<Screen>(screen);
+#else
         gint n_screens = gdk_display_get_n_screens(display);
         for ( gint i = 0 ; i < n_screens ; i++ ) {
             GdkScreen *screen = gdk_display_get_screen(display, i);
             Logger::write<Screen>(screen);
         }
+#endif
     }
 };
 
-- 
cgit v1.2.3


From 990c48b80c39b942dac8bb87f16189f52ffb0d8e Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sat, 6 Sep 2014 11:25:51 -0400
Subject: More header cleanup

(bzr r13341.1.198)
---
 src/debug/gdk-event-latency-tracker.cpp | 2 ++
 src/debug/gdk-event-latency-tracker.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/debug')

diff --git a/src/debug/gdk-event-latency-tracker.cpp b/src/debug/gdk-event-latency-tracker.cpp
index b21675f53..4679f05f1 100644
--- a/src/debug/gdk-event-latency-tracker.cpp
+++ b/src/debug/gdk-event-latency-tracker.cpp
@@ -9,6 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gdk/gdk.h>
+
 #include "debug/gdk-event-latency-tracker.h"
 #include "preferences.h"
 
diff --git a/src/debug/gdk-event-latency-tracker.h b/src/debug/gdk-event-latency-tracker.h
index c3624e74f..0fdb18790 100644
--- a/src/debug/gdk-event-latency-tracker.h
+++ b/src/debug/gdk-event-latency-tracker.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H
 #define SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H
 
-#include <gdk/gdk.h>
+typedef union _GdkEvent GdkEvent;
 #include <glibmm/timer.h>
 #include <boost/optional.hpp>
 
-- 
cgit v1.2.3