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/display/canvas-grid.cpp     | 3 ++-
 src/display/nr-filter-image.cpp | 2 +-
 src/display/sp-canvas.cpp       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/display')

diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index c53890f9f..88da22835 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -17,7 +17,6 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 
@@ -27,6 +26,8 @@
 # include <gtkmm/table.h>
 #endif
 
+#include <glibmm/i18n.h>
+
 #include "ui/widget/registered-widget.h"
 #include "desktop.h"
 #include "sp-canvas-util.h"
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index fca8fdba3..7a27d857e 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -10,6 +10,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#include "display/nr-filter-image.h"
 #include "document.h"
 #include "sp-item.h"
 #include "display/cairo-utils.h"
@@ -17,7 +18,6 @@
 #include "display/drawing.h"
 #include "display/drawing-item.h"
 #include "display/nr-filter.h"
-#include "display/nr-filter-image.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 #include "enums.h"
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 8b20ab2de..9d4049512 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -19,6 +19,7 @@
 # include <config.h>
 #endif
 
+#include <gdkmm/rectangle.h>
 #include <cairomm/region.h>
 
 #include "helper/sp-marshal.h"
@@ -35,7 +36,6 @@
 #include "debug/gdk-event-latency-tracker.h"
 #include "desktop.h"
 #include "sp-namedview.h"
-#include <gdkmm/rectangle.h>
 
 using Inkscape::Debug::GdkEventLatencyTracker;
 
-- 
cgit v1.2.3