diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2011-12-08 11:53:54 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2011-12-08 11:53:54 +0000 |
| commit | 4e51446f417ad82d2cdac758d0c5ce908ff88038 (patch) | |
| tree | fca19a5966d6d49873062bb0b40550f6c4984156 /src/libnrtype | |
| parent | Colors. Patch for Bug #677081 (Default paste color opacity) by Romain. (diff) | |
| download | inkscape-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/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 2 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 2 | ||||
| -rw-r--r-- | src/libnrtype/nr-type-primitives.cpp | 2 | ||||
| -rw-r--r-- | src/libnrtype/nr-type-primitives.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index e6d22e070..63f9bd6b0 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -15,7 +15,7 @@ #endif #include <glibmm.h> -#include <glib/gmem.h> +#include <glib.h> #include <glibmm/i18n.h> // _() #include <pango/pangoft2.h> #include "libnrtype/FontFactory.h" diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index ebb71d388..8546e706f 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -8,7 +8,7 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib/gmem.h> +#include <glib.h> #include "Layout-TNG.h" #include "display/drawing-text.h" #include "style.h" diff --git a/src/libnrtype/nr-type-primitives.cpp b/src/libnrtype/nr-type-primitives.cpp index 2fbc18ffd..63a3abcc5 100644 --- a/src/libnrtype/nr-type-primitives.cpp +++ b/src/libnrtype/nr-type-primitives.cpp @@ -14,7 +14,7 @@ #include <stdlib.h> #include <string.h> -#include <glib/gmem.h> +#include <glib.h> #include "nr-type-primitives.h" /** diff --git a/src/libnrtype/nr-type-primitives.h b/src/libnrtype/nr-type-primitives.h index 92b94e9a8..9bb181c4b 100644 --- a/src/libnrtype/nr-type-primitives.h +++ b/src/libnrtype/nr-type-primitives.h @@ -11,7 +11,7 @@ * This code is in public domain */ -#include <glib/gtypes.h> +#include <glib.h> struct NRNameList; struct NRStyleList; |