summaryrefslogtreecommitdiffstats
path: root/src/widgets
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/widgets
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/widgets')
-rw-r--r--src/widgets/icon.cpp2
-rw-r--r--src/widgets/sp-color-icc-selector.h2
-rw-r--r--src/widgets/sp-color-scales.h2
-rw-r--r--src/widgets/sp-color-wheel-selector.h2
-rw-r--r--src/widgets/spinbutton-events.h2
-rw-r--r--src/widgets/spw-utilities.h2
-rw-r--r--src/widgets/stroke-style.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 9540b59d6..09caaa7f1 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -17,7 +17,7 @@
#endif
#include <cstring>
-#include <glib/gmem.h>
+#include <glib.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <gtkmm.h>
diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h
index a3915cd48..166348830 100644
--- a/src/widgets/sp-color-icc-selector.h
+++ b/src/widgets/sp-color-icc-selector.h
@@ -1,7 +1,7 @@
#ifndef SEEN_SP_COLOR_ICC_SELECTOR_H
#define SEEN_SP_COLOR_ICC_SELECTOR_H
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include "../color.h"
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index 8ffe5e7a8..3b11bc05e 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/widgets/sp-color-scales.h
@@ -1,7 +1,7 @@
#ifndef SEEN_SP_COLOR_SCALES_H
#define SEEN_SP_COLOR_SCALES_H
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include <color.h>
diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index 5674850cb..4d8f79976 100644
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -1,7 +1,7 @@
#ifndef SEEN_SP_COLOR_WHEEL_SELECTOR_H
#define SEEN_SP_COLOR_WHEEL_SELECTOR_H
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include "../color.h"
diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h
index 46652a346..cf8c7b44b 100644
--- a/src/widgets/spinbutton-events.h
+++ b/src/widgets/spinbutton-events.h
@@ -9,7 +9,7 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtk.h> /* GtkWidget */
gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
index 443831353..7ae36aa29 100644
--- a/src/widgets/spw-utilities.h
+++ b/src/widgets/spw-utilities.h
@@ -18,7 +18,7 @@
SPObject, that reacts to modification.
*/
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtk.h> /* GtkWidget */
#include <gtkmm/widget.h>
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 488b10666..23c02ea35 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -17,7 +17,7 @@
#define noSP_SS_VERBOSE
-#include <glib/gmem.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include <glibmm/i18n.h>