summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2011-12-08 11:53:54 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2011-12-08 11:53:54 +0000
commit4e51446f417ad82d2cdac758d0c5ce908ff88038 (patch)
treefca19a5966d6d49873062bb0b40550f6c4984156 /src/ui
parentColors. Patch for Bug #677081 (Default paste color opacity) by Romain. (diff)
downloadinkscape-4e51446f417ad82d2cdac758d0c5ce908ff88038.tar.gz
inkscape-4e51446f417ad82d2cdac758d0c5ce908ff88038.zip
Switch to top-level glib headers. Thanks to DimStar for patch
Fixed bugs: - https://launchpad.net/bugs/898538 (bzr r10762)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/cache/svg_preview_cache.cpp2
-rw-r--r--src/ui/dialog/desktop-tracker.h2
-rw-r--r--src/ui/dialog/dialog-manager.h2
-rw-r--r--src/ui/dialog/icon-preview.cpp2
-rw-r--r--src/ui/widget/icon-widget.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 912bc1a40..f8a806a13 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -19,7 +19,7 @@
# include "config.h"
#endif
-#include <glib/gmem.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include <2geom/transforms.h>
#include "sp-namedview.h"
diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index da276fae4..0c8af66bf 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -9,7 +9,7 @@
#include <stddef.h>
#include <sigc++/connection.h>
-#include <glib/gtypes.h>
+#include <glib.h>
typedef struct _GtkWidget GtkWidget;
class SPDesktop;
diff --git a/src/ui/dialog/dialog-manager.h b/src/ui/dialog/dialog-manager.h
index 90e1862f1..45d8d8f66 100644
--- a/src/ui/dialog/dialog-manager.h
+++ b/src/ui/dialog/dialog-manager.h
@@ -14,7 +14,7 @@
#ifndef INKSCAPE_UI_DIALOG_MANAGER_H
#define INKSCAPE_UI_DIALOG_MANAGER_H
-#include <glib/gquark.h>
+#include <glib.h>
#include "dialog.h"
#include <map>
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 0157cd267..a2b952677 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -19,7 +19,7 @@
#include <boost/scoped_ptr.hpp>
#include <gtk/gtk.h>
-#include <glib/gmem.h>
+#include <glib.h>
#include <glibmm/i18n.h>
#include <gtkmm/alignment.h>
#include <gtkmm/buttonbox.h>
diff --git a/src/ui/widget/icon-widget.cpp b/src/ui/widget/icon-widget.cpp
index b671e8812..d04f89b15 100644
--- a/src/ui/widget/icon-widget.cpp
+++ b/src/ui/widget/icon-widget.cpp
@@ -12,7 +12,7 @@
# include <config.h>
#endif
-#include <glib/gmem.h>
+#include <glib.h>
#include "icon-widget.h"
namespace Inkscape {