Move i18n.[ch] to src/pulsecore

The header is used in files troughout the tree and is not included in the public api,
so it belongs in pulsecore, not in pulse.

diff --git a/src/Makefile.am b/src/Makefile.am
index ebf5ebc97fad504e9a2067aca59fef4a540f3496..6b775e539783951632ff59ecc2e4d42a47bfda6a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -523,7 +523,6 @@ lib_LTLIBRARIES = \
 
 libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
                pulse/client-conf.c pulse/client-conf.h \
-               pulse/i18n.c pulse/i18n.h \
                pulse/fork-detect.c pulse/fork-detect.h \
                pulse/xmalloc.c pulse/xmalloc.h \
                pulse/proplist.c pulse/proplist.h \
@@ -545,11 +544,12 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
                pulsecore/endianmacros.h \
                pulsecore/flist.c pulsecore/flist.h \
                pulsecore/hashmap.c pulsecore/hashmap.h \
+               pulsecore/i18n.c pulsecore/i18n.h \
                pulsecore/idxset.c pulsecore/idxset.h \
                pulsecore/arpa-inet.c pulsecore/arpa-inet.h \
                pulsecore/iochannel.c pulsecore/iochannel.h \
                pulsecore/ioline.c pulsecore/ioline.h \
-               pulsecore/ipacl.h pulsecore/ipacl.c \
+               pulsecore/ipacl.c pulsecore/ipacl.h \
                pulsecore/llist.h \
                pulsecore/lock-autospawn.c pulsecore/lock-autospawn.h \
                pulsecore/log.c pulsecore/log.h \

diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 74ccb1c8a52d3c7a2155dfb0172df32686dcb864..37593880500c798eef6cada718e3f4aa8e7ea5bb 100644 (file)
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -28,8 +28,7 @@
 #include <errno.h>
 #include <sys/types.h>
 
-#include <pulse/i18n.h>
-
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/log.h>
 

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index ec37d46b4e9179c609b67a10675b3157c7bf7778..d42f90dba2391b27337bd5316f9b5c0edee5708a 100644 (file)
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -28,10 +28,10 @@
 #include <getopt.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 #include <pulse/util.h>
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/strbuf.h>
 #include <pulsecore/macro.h>
 

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index bb9290911a7a5b4ee85e16f556bfcb82fa59305d..1f70b092ecf2233a11f31f8e2e9ba9040a240ada 100644 (file)
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -37,11 +37,11 @@
 
 #include <pulse/xmalloc.h>
 #include <pulse/timeval.h>
-#include <pulse/i18n.h>
 #include <pulse/version.h>
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/strbuf.h>
 #include <pulsecore/conf-parser.h>
 #include <pulsecore/resampler.h>

diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c
index 68ab5bba79b803d8b80a812ef32ce85401463d06..009fbe56008e2e123a08530e29ddf4d676decdf3 100644 (file)
--- a/src/daemon/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -29,11 +29,11 @@
 #include <ltdl.h>
 
 #include <pulse/util.h>
-#include <pulse/i18n.h>
 
-#include <pulsecore/modinfo.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/modinfo.h>
 
 #include "dumpmodules.h"
 

diff --git a/src/daemon/ltdl-bind-now.c b/src/daemon/ltdl-bind-now.c
index 2ba73ce72f5d6574c002d6552961ed0ec7d45d14..605a3e2922080d174a170b89bdd0eefc8b0a5aa2 100644 (file)
--- a/src/daemon/ltdl-bind-now.c
+++ b/src/daemon/ltdl-bind-now.c
@@ -36,8 +36,7 @@
 
 #include <ltdl.h>
 
-#include <pulse/i18n.h>
-
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/log.h>
 

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 94c87d15b7566fd91530ea9b7f86eb530ac517e5..55726fdbe8978347ae5bbbe9e70aeec4c679fafb 100644 (file)
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -66,8 +66,8 @@
 #include <pulse/mainloop-signal.h>
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/lock-autospawn.h>
 #include <pulsecore/socket.h>
 #include <pulsecore/core-error.h>

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 3a2ed6a851738642caf68cc308083efcb1086327..8e34456d7203666aad5cf4fc54458692be65b80b 100644 (file)
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -38,9 +38,9 @@
 #include <pulse/util.h>
 #include <pulse/volume.h>
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 #include <pulse/utf8.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>

diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 00eb33aea9b8a8735c51f214db1dc5aadacac8d2..7b9b8d8d10a55afce801c0a9c834e72b23b182e6 100644 (file)
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -32,13 +32,13 @@
 #include <valgrind/memcheck.h>
 #endif
 
-#include <pulse/i18n.h>
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
 #include <pulse/volume.h>
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/module.h>
 #include <pulsecore/memchunk.h>
 #include <pulsecore/sink.h>

diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 6438c33885ceced551630872337b9628a1e44c9b..cbf1dc248c881b260925606f9669ad9b873af325 100644 (file)
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -28,13 +28,13 @@
 
 #include <asoundlib.h>
 
-#include <pulse/i18n.h>
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
 #include <pulse/volume.h>
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/module.h>
 #include <pulsecore/memchunk.h>
 #include <pulsecore/sink.h>

diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 883c26f91ad7ef861c3262e9dd9d17575737fb1a..602e9a366f6321f8f21af694ed4e33b8651bb8f4 100644 (file)
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -31,9 +31,9 @@
 #include <pulse/xmalloc.h>
 #include <pulse/timeval.h>
 #include <pulse/util.h>
-#include <pulse/i18n.h>
 #include <pulse/utf8.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>

diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index e60aa5ef4f438adceb8921a9d6b2b585384f7a72..8b19d42b78af67266b02b65e36aea5d431360bd9 100644 (file)
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -24,9 +24,9 @@
 #endif
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/queue.h>
 

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 9f8133638e9c5ac3b42e3db464370b82e3909117..efbc1447c20224e98305a78a1f8afd9fcc1e3b5b 100644 (file)
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -28,12 +28,12 @@
 #include <linux/sockios.h>
 #include <arpa/inet.h>
 
-#include <pulse/i18n.h>
 #include <pulse/rtclock.h>
 #include <pulse/sample.h>
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/module.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/core-rtclock.h>

diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index 961f28994a3e0936b8e2098f31124b1dfc91657a..704228e127f1546f46f29fd5524353bef0c83951 100644 (file)
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -35,10 +35,10 @@
 #include "echo-cancel.h"
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 #include <pulse/timeval.h>
 #include <pulse/rtclock.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/atomic.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/namereg.h>

diff --git a/src/modules/module-always-sink.c b/src/modules/module-always-sink.c
index 4c871da4bc8c169a6f2e2f4544ec97f8ce40f429..5d9ee631aebb15d907236a95724f1abd8e203df9 100644 (file)
--- a/src/modules/module-always-sink.c
+++ b/src/modules/module-always-sink.c
@@ -24,13 +24,13 @@
 #endif
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/core.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/log.h>
-#include <pulsecore/core-util.h>
 
 #include "module-always-sink-symdef.h"
 

diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
index ee9b6787c5546c14ccba24c3f23ad27b9f3fb7b5..7161c05157271e736f731de77c77c2d2d4f7e387 100644 (file)
--- a/src/modules/module-equalizer-sink.c
+++ b/src/modules/module-equalizer-sink.c
@@ -46,10 +46,10 @@
 #include <fftw3.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 #include <pulse/timeval.h>
 
 #include <pulsecore/core-rtclock.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/aupdate.h>
 #include <pulsecore/namereg.h>
 #include <pulsecore/sink.h>

diff --git a/src/modules/module-filter-apply.c b/src/modules/module-filter-apply.c
index c742373aca87b6ac76e81443cd0b509ff41a6069..bf5d0c5056e1cbe23d1666aaf135a89b33dc4327 100644 (file)
--- a/src/modules/module-filter-apply.c
+++ b/src/modules/module-filter-apply.c
@@ -25,14 +25,14 @@
 
 #include <pulse/timeval.h>
 #include <pulse/rtclock.h>
-#include <pulse/i18n.h>
 #include <pulse/xmalloc.h>
 
+#include <pulsecore/core.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/hashmap.h>
 #include <pulsecore/hook-list.h>
-#include <pulsecore/core.h>
-#include <pulsecore/core-util.h>
 #include <pulsecore/sink-input.h>
 #include <pulsecore/modargs.h>
 

diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c
index 9b4903a156d2c9a19fd940fbc56d7e5fa3f160ad..7a60403b36397aa0acd48a7e227633af24f5532d 100644 (file)
--- a/src/modules/module-ladspa-sink.c
+++ b/src/modules/module-ladspa-sink.c
@@ -29,8 +29,8 @@
 #include <math.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/namereg.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/module.h>

diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 09e6ab72c835fb15d781c933cbe5e13ac638cf20..10868f5c0c15e25f5d60d0f0a4c38ea2ec133cce 100644 (file)
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -31,8 +31,8 @@
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/module.h>

diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
index 1856835f491a6d63fbd6fbf649a0a9e32e36f610..9af0cebbbce88a6f96c4a6a0ce9ece870c7ba113 100644 (file)
--- a/src/modules/module-rygel-media-server.c
+++ b/src/modules/module-rygel-media-server.c
@@ -30,9 +30,9 @@
 
 #include <pulse/gccmacro.h>
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 #include <pulse/utf8.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/source.h>
 #include <pulsecore/core-util.h>

diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c
index 0a410e44d48901bc2e4be58d6be9780170ee651d..34c4ae80b91f6e7b0600d63372bad39dfd24740c 100644 (file)
--- a/src/modules/module-virtual-sink.c
+++ b/src/modules/module-virtual-sink.c
@@ -29,8 +29,8 @@
 
 #include <pulse/gccmacro.h>
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/namereg.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/module.h>

diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c
index b7f698275ec7415a621484d1b0d6169b4a600b9b..70e327ba311b70ced98a5404e1990f12a3894a1d 100644 (file)
--- a/src/modules/module-virtual-source.c
+++ b/src/modules/module-virtual-source.c
@@ -27,8 +27,8 @@
 #include <stdio.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/namereg.h>
 #include <pulsecore/sink.h>

diff --git a/src/modules/reserve-wrap.c b/src/modules/reserve-wrap.c
index 515cb2248e19b683dd9e51fb9ffe212b9810ec5a..1411d272d37ab45f80ca562ac03a275eacd5e80e 100644 (file)
--- a/src/modules/reserve-wrap.c
+++ b/src/modules/reserve-wrap.c
@@ -26,10 +26,10 @@
 #include <errno.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/shared.h>
 
 #ifdef HAVE_DBUS

diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index 83fdb43719c119d7b48ad6d4e3121b5414850518..0d199f350e446707f60df64ce1ce3ce34b887a84 100644 (file)
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -29,8 +29,8 @@
 #include <string.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/bitset.h>

diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c
index 76b1b7b39b27d01960a5fba2bccd074e96eccc7f..76b9f6fbb2665c31a69b2abbd058b934b492d702 100644 (file)
--- a/src/pulse/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -28,8 +28,8 @@
 #include <xcb/xcb.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/x11prop.h>
 #include <pulsecore/log.h>
 #include <pulsecore/core-util.h>

diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index e899af19622e26745d986fd6f379226b566b6c81..e2c2aae176b16ee900d397b334bf0cbb64574c24 100644 (file)
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -29,8 +29,8 @@
 #include <errno.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/log.h>

diff --git a/src/pulse/context.c b/src/pulse/context.c
index dbb5d42b726f9d3d26422b365a7fc78856053b40..25d04a1e9690a139df6b7acf39520b7a7b6fa358 100644 (file)
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -44,7 +44,6 @@
 #include <pulse/version.h>
 #include <pulse/xmalloc.h>
 #include <pulse/util.h>
-#include <pulse/i18n.h>
 #include <pulse/mainloop.h>
 #include <pulse/timeval.h>
 #include <pulse/fork-detect.h>
@@ -54,6 +53,7 @@
 #endif
 
 #include <pulsecore/core-error.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/native-common.h>
 #include <pulsecore/pdispatch.h>
 #include <pulsecore/pstream.h>

diff --git a/src/pulse/error.c b/src/pulse/error.c
index 19a759c2fb8bbc108b9dd6012aea316ae590de56..eb5082a4637b267277e55c3c760966c718c9ed89 100644 (file)
--- a/src/pulse/error.c
+++ b/src/pulse/error.c
@@ -29,7 +29,8 @@
 #include <stdlib.h>
 
 #include <pulse/def.h>
-#include <pulse/i18n.h>
+
+#include <pulsecore/i18n.h>
 
 #include "error.h"
 

diff --git a/src/pulse/format.c b/src/pulse/format.c
index b256d72fecf57ccd327cd234dd7dbcfee8d644e8..81c329ff09f59d33a4c14a9f761118d27a9f3503 100644 (file)
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -29,9 +29,9 @@
 
 #include <pulse/internal.h>
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 
 #include "format.h"

diff --git a/src/pulse/mainloop-api.c b/src/pulse/mainloop-api.c
index c1f760467ce7629782819cc2777d82039e979f8e..45539cc2716008dcc38104344556eb7a03991674 100644 (file)
--- a/src/pulse/mainloop-api.c
+++ b/src/pulse/mainloop-api.c
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 
 #include "mainloop-api.h"

diff --git a/src/pulse/mainloop-signal.c b/src/pulse/mainloop-signal.c
index 393d1f7db8432b31eb92d22bf8fdfd94eae772f6..9482fe37549459e535c10048b81ed6fc9c1d74f9 100644 (file)
--- a/src/pulse/mainloop-signal.c
+++ b/src/pulse/mainloop-signal.c
@@ -36,10 +36,10 @@
 #endif
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 

diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index 3ef387b6416b74f6b8b6b3bfc5ba121a7dc3cab9..8e956c99531c8e130859797b2a0c179216e1a063 100644 (file)
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -34,7 +34,6 @@
 #include <pulsecore/pipe.h>
 #endif
 
-#include <pulse/i18n.h>
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
@@ -42,6 +41,7 @@
 #include <pulsecore/poll.h>
 #include <pulsecore/core-rtclock.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/llist.h>
 #include <pulsecore/log.h>
 #include <pulsecore/core-error.h>

diff --git a/src/pulse/sample.c b/src/pulse/sample.c
index 8365e93eaa32a7f45af5963ca556ac2274023a29..b6136120d28a7fdf69fda39bda773268052a63ba 100644 (file)
--- a/src/pulse/sample.c
+++ b/src/pulse/sample.c
@@ -28,9 +28,9 @@
 #include <string.h>
 
 #include <pulse/timeval.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 
 #include "sample.h"

diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index b07ad789aff2321eac90e14d382a66af660a306f..aa56a9209cee84e836a68563b10a0e222555f814 100644 (file)
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -33,8 +33,8 @@
 
 #include <pulse/xmalloc.h>
 #include <pulse/mainloop.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/log.h>
 #include <pulsecore/thread.h>
 #include <pulsecore/mutex.h>

diff --git a/src/pulse/volume.c b/src/pulse/volume.c
index 82e575727c55edf9c4b05f959e6763fbf1fb0ebc..cf0a22624418e04af108b0b3ad407ac10a0b3786 100644 (file)
--- a/src/pulse/volume.c
+++ b/src/pulse/volume.c
@@ -27,9 +27,8 @@
 #include <string.h>
 #include <math.h>
 
-#include <pulse/i18n.h>
-
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/sample-util.h>
 

diff --git a/src/pulse/i18n.c b/src/pulsecore/i18n.c
similarity index 100%
rename from src/pulse/i18n.c
rename to src/pulsecore/i18n.c

diff --git a/src/pulse/i18n.h b/src/pulsecore/i18n.h
similarity index 98%
rename from src/pulse/i18n.h
rename to src/pulsecore/i18n.h
index fac3c7b2bd6c66e2886b9a469ec3602872f61388..d828becda81ec2f0a6896f3da6909d2947afa9f8 100644 (file)
--- a/src/pulse/i18n.h
+++ b/src/pulsecore/i18n.h
@@ -23,7 +23,6 @@
 ***/
 
 #include <pulse/cdecl.h>
-#include <pulse/version.h>
 
 PA_C_DECL_BEGIN
 

diff --git a/src/pulsecore/lock-autospawn.c b/src/pulsecore/lock-autospawn.c
index 40aa5e927b1c750ebd6f2551761bd4bcfffe6d58..b1d414baf698a58a2541123ba32410e5c1b72040 100644 (file)
--- a/src/pulsecore/lock-autospawn.c
+++ b/src/pulsecore/lock-autospawn.c
@@ -32,9 +32,9 @@
 #endif
 
 #include <pulse/gccmacro.h>
-#include <pulse/i18n.h>
 #include <pulse/xmalloc.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/poll.h>
 #include <pulsecore/mutex.h>
 #include <pulsecore/thread.h>

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 714b3d2ebd890227588471954cd86c0389b76bac..42a8eb3daea92f01855606048d9f69abf585c84b 100644 (file)
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -34,10 +34,10 @@
 #include <pulse/xmalloc.h>
 #include <pulse/timeval.h>
 #include <pulse/util.h>
-#include <pulse/i18n.h>
 #include <pulse/rtclock.h>
 #include <pulse/internal.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/sink-input.h>
 #include <pulsecore/namereg.h>
 #include <pulsecore/core-util.h>

diff --git a/src/tests/resampler-test.c b/src/tests/resampler-test.c
index 78461da57c72324483d369a79386f888a90eac12..545c0e087f2151538a225721889d3a712f8ca270 100644 (file)
--- a/src/tests/resampler-test.c
+++ b/src/tests/resampler-test.c
@@ -25,13 +25,13 @@
 #include <getopt.h>
 #include <locale.h>
 
-#include <pulse/i18n.h>
 #include <pulse/pulseaudio.h>
 
 #include <pulse/rtclock.h>
 #include <pulse/sample.h>
 #include <pulse/volume.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/resampler.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/endianmacros.h>

diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index 323f071b1deb0c2a210b7923f2df7f10e2bdcdc7..f687402c52018f18fcddffabf2a45ff7363ef9cd 100644 (file)
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -37,15 +37,14 @@
 
 #include <sndfile.h>
 
-#include <pulse/i18n.h>
 #include <pulse/pulseaudio.h>
 #include <pulse/rtclock.h>
 
-#include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/log.h>
+#include <pulsecore/macro.h>
 #include <pulsecore/sndfile-util.h>
-#include <pulsecore/core-util.h>
 
 #define TIME_EVENT_USEC 50000
 

diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index f07798028891ba9fccb3149ea81dcab424c3d0a1..4166964ea9f6f786df57a77344eb1e5ae81ed554 100644 (file)
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -34,8 +34,8 @@
 
 #include <pulse/util.h>
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/poll.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>

diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index c95a38cecd0c4b64201c789325fcf118317eda94..2c5be93498901df80219a124c23bdcd92c7ece90 100644 (file)
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -35,9 +35,9 @@
 
 #include <sndfile.h>
 
-#include <pulse/i18n.h>
 #include <pulse/pulseaudio.h>
 
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>

diff --git a/src/utils/pasuspender.c b/src/utils/pasuspender.c
index e1ee2512187c0ee46c238ff7b2fc7aa4d51e8ecc..90881b2a0f7a1fc3f7b2ee380f88464eab4e7bb7 100644 (file)
--- a/src/utils/pasuspender.c
+++ b/src/utils/pasuspender.c
@@ -40,8 +40,9 @@
 #include <sys/prctl.h>
 #endif
 
-#include <pulse/i18n.h>
 #include <pulse/pulseaudio.h>
+
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 
 static pa_context *context = NULL;

diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 41361a158251b4a0831c135ecb142672279ff724..ddfb7242f1125d583fab5834baf056527cc8ad0b 100644 (file)
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -31,10 +31,10 @@
 #include <xcb/xcb.h>
 
 #include <pulse/util.h>
-#include <pulse/i18n.h>
 #include <pulse/client-conf.h>
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/log.h>
 #include <pulsecore/authkey.h>
 #include <pulsecore/native-common.h>