From 0cdd007ebf8dcfbd39c1d36ab53f43617eb692df Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 25 Mar 2013 17:42:31 +0000
Subject: Workaround usage of deprecated glib symbols in 3rd party libraries

Fixed bugs:
  - https://launchpad.net/bugs/1122774

(bzr r12243)
---
 src/interface.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/interface.cpp')

diff --git a/src/interface.cpp b/src/interface.cpp
index 69832a2eb..4421b4a1d 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -23,9 +23,9 @@
 # include "config.h"
 #endif
 
-#include "file.h"
-#include <glib.h>
+#include "ui/dialog/dialog-manager.h"
 #include <gtkmm/icontheme.h>
+#include "file.h"
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 
@@ -75,11 +75,7 @@
 #include "sp-image.h"
 #include "sp-item.h"
 #include "sp-mask.h"
-// #include "verbs.h"
 #include "message-stack.h"
-// #include "inkscape.h"
-#include "ui/dialog/dialog-manager.h"
-// #include "../xml/repr.h"
 #include "ui/dialog/layer-properties.h"
 
 #include <gdk/gdkkeysyms.h>
-- 
cgit v1.2.3


From d2bba282171a9e2c70a624794650689ec4531047 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 26 Mar 2013 16:03:49 +0000
Subject: Fix Glibmm inclusions for Gtk+ 3 builds and implement a Gtk+ 3
 compatible check for X11 backend

Fixed bugs:
  - https://launchpad.net/bugs/1160252
  - https://launchpad.net/bugs/1122774

(bzr r12247)
---
 src/interface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/interface.cpp')

diff --git a/src/interface.cpp b/src/interface.cpp
index 4421b4a1d..986d3107f 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -79,7 +79,8 @@
 #include "ui/dialog/layer-properties.h"
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
+
+#include <glibmm/miscutils.h>
 
 using Inkscape::DocumentUndo;
 
-- 
cgit v1.2.3