Workaround usage of deprecated glib symbols in 3rd party libraries

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

(bzr r12243)

16 files changed, 21 insertions, 29 deletions

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 8cdb37f4f..f2b9fb02a 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -21,6 +21,7 @@
  * See the file COPYING for details.
  */
 
+#include <gtkmm/clipboard.h>
 #include "ui/clipboard.h"
 
 // TODO: reduce header bloat if possible
@@ -28,7 +29,6 @@
 #include "file.h" // for file_import, used in _pasteImage
 #include <list>
 #include <algorithm>
-#include <gtkmm/clipboard.h>
 #include <glibmm/ustring.h>
 #include <glibmm/i18n.h>
 #include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 2ff4ed657..e09d9b1d1 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -12,8 +12,8 @@
  */
 
 #include <errno.h>
-#include <glibmm/i18n.h>
 #include <gtkmm/label.h>
+#include <glibmm/i18n.h>
 #include <cairo.h>
 #include <gtk/gtk.h>
 
diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index e61f8e389..d127261c0 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -13,13 +13,13 @@
 # include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/textview.h>
 #include <gtkmm/button.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/scrolledwindow.h>
+#include <glibmm/i18n.h>
 
 #include "debug.h"
 
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 34a908995..65c6a20fe 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -17,10 +17,9 @@
 # include <config.h>
 #endif
 
+#include "inkscape-preferences.h"
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
-
-#include "inkscape-preferences.h"
 #include <gtkmm/main.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 3d780fa83..f5addc401 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -20,19 +20,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <glibmm/i18n.h>
-
+#include "ui/dialog/dialog-manager.h"
 #include "desktop-handles.h"
 #include "macros.h"
 #include "sp-anchor.h"
 #include "sp-image.h"
 #include "verbs.h"
 #include "xml/repr.h"
-#include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/object-attributes.h"
 #include "widgets/sp-attribute-widget.h"
 #include "inkscape.h"
 #include "selection.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 326542579..8cb247766 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -13,8 +13,6 @@
 #ifndef __OCAL_DIALOG_H__
 #define __OCAL_DIALOG_H__
 
-#include <cairomm/refptr.h>
-
 //Gtk includes
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
@@ -22,6 +20,8 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/window.h>
 
+#include <cairomm/refptr.h>
+
 #if GTK_CHECK_VERSION(3,6,0)
 # include <gtkmm/searchentry.h>
 #endif
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index cc6ddd7de..dfc92774c 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -18,8 +18,6 @@
 #include <functional>
 #include <sstream>
 
-#include <glibmm/i18n.h>
-
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
 
@@ -36,6 +34,7 @@
 #include <gtkmm/treemodelcolumn.h>
 #include <gtkmm/clipboard.h>
 
+#include <glibmm/i18n.h>
 #include "path-prefix.h"
 #include "io/sys.h"
 
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index b96c9158a..a487eb930 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -14,11 +14,11 @@
 # include <config.h>
 #endif
 
+#include "undo-history.h"
 #include <glibmm/i18n.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
-#include "undo-history.h"
 #include "document.h"
 #include "document-undo.h"
 #include "inkscape.h"
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 629608242..70bd0e859 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -11,9 +11,8 @@
  */
 
 #include <boost/shared_ptr.hpp>
-#include <glib.h>
-#include <glibmm/i18n.h>
 #include "node.h"
+#include <glibmm/i18n.h>
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
diff --git a/src/ui/widget/imageicon.h b/src/ui/widget/imageicon.h
index 803b2f53f..2ea8b8533 100644
--- a/src/ui/widget/imageicon.h
+++ b/src/ui/widget/imageicon.h
@@ -12,9 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/ustring.h>
 #include <gtkmm/box.h>
-
+#include <glibmm/ustring.h>
 
 class SPDocument;
 
diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h
index ca1bfd69d..7b02fa4dc 100644
--- a/src/ui/widget/imagetoggler.h
+++ b/src/ui/widget/imagetoggler.h
@@ -14,9 +14,9 @@
 #include "config.h"
 #endif
 
-#include <glibmm/property.h>
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/widget.h>
+#include <glibmm/property.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 48749fda2..7eb114d0a 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -15,8 +15,6 @@
 # include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
-
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
@@ -24,6 +22,8 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 
+#include <glibmm/i18n.h>
+
 #include <gtk/gtk.h>
 
 #include "panel.h"
diff --git a/src/ui/widget/point.h b/src/ui/widget/point.h
index 15f1a80fb..17078df8f 100644
--- a/src/ui/widget/point.h
+++ b/src/ui/widget/point.h
@@ -13,8 +13,8 @@
 #ifndef INKSCAPE_UI_WIDGET_POINT_H
 #define INKSCAPE_UI_WIDGET_POINT_H
 
-#include <2geom/point.h>
 #include "ui/widget/labelled.h"
+#include <2geom/point.h>
 #include "ui/widget/scalar.h"
 
 namespace Gtk {
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index 7655f25e3..f26e71553 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -12,10 +12,9 @@
 # include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
-
-#include "unit-constants.h"
 #include "rendering-options.h"
+#include "unit-constants.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index 8aab57a34..548e9a6a6 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -6,10 +6,9 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include <glib.h>
+#include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
-#include <gtkmm/adjustment.h>
 
 #include "spin-scale.h"
 #include "ui/widget/gimpspinscale.h"
diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index facbf704c..1cb59a7b3 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -8,12 +8,11 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include <glib.h>
+#include "spin-slider.h"
+
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
 
-#include "spin-slider.h"
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {