# HG changeset patch
# User nenolod
# Date 1169520077 28800
# Node ID d124034ebea33e69fa6c27df7782c50a41ead0e0
# Parent  5fa8b0ca6d613f90b3869bf488a1e6dae60ca4cf
[svn] - glib/gi18n.h -> audacious/i18n.h for automatic dgettext support

diff -r 5fa8b0ca6d61 -r d124034ebea3 ChangeLog
--- a/ChangeLog	Mon Jan 22 14:56:02 2007 -0800
+++ b/ChangeLog	Mon Jan 22 18:41:17 2007 -0800
@@ -1,3 +1,10 @@
+2007-01-22 22:56:02 +0000  Giacomo Lozito <james@develia.org>
+  revision [1138]
+  - metronom: use g_malloc in place of malloc
+  trunk/src/metronom/metronom.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-01-22 22:52:22 +0000  Giacomo Lozito <james@develia.org>
   revision [1136]
   - mpg123: fix warnings in compilation, added function prototype to common.h
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/CoreAudio/configure.c
--- a/src/CoreAudio/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/CoreAudio/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,11 +17,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-//#include <glib/gi18n.h>
 #include "coreaudio.h"
 #include "audacious/configdb.h"
 #include <CoreAudio/CoreAudio.h>
 
+#include <audacious/i18n.h>
+
 static GtkWidget *configure_win = NULL;
 static GtkWidget *mixer_usemaster_check, *buffer_size_spin, *buffer_pre_spin;
 static GtkWidget *adevice_use_alt_check, *audio_alt_device_entry;
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/CoreAudio/coreaudio.c
--- a/src/CoreAudio/coreaudio.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/CoreAudio/coreaudio.c	Mon Jan 22 18:41:17 2007 -0800
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include <glib.h>
-#include <glib/gi18n.h>
 
 #include "coreaudio.h"
 
 #include "audacious/plugin.h"
+#include <audacious/i18n.h>
 
 OutputPlugin osx_op =
 	{
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/OSS/OSS.c
--- a/src/OSS/OSS.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/OSS/OSS.c	Mon Jan 22 18:41:17 2007 -0800
@@ -22,7 +22,7 @@
 #include "OSS.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <stdlib.h>
 
 OutputPlugin oss_op = {
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/OSS/about.c
--- a/src/OSS/about.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/OSS/about.c	Mon Jan 22 18:41:17 2007 -0800
@@ -22,7 +22,7 @@
 #include "OSS.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
 #include <audacious/util.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/OSS/configure.c
--- a/src/OSS/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/OSS/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -22,13 +22,13 @@
 #include "OSS.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <audacious/configdb.h>
 #include <audacious/vfs.h>
+#include <audacious/i18n.h>
 
 
 static GtkWidget *configure_win = NULL;
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/aac/src/libmp4.c
--- a/src/aac/src/libmp4.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/aac/src/libmp4.c	Mon Jan 22 18:41:17 2007 -0800
@@ -1,5 +1,4 @@
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -12,6 +11,7 @@
 #include <audacious/util.h>
 #include <audacious/titlestring.h>
 #include <audacious/vfs.h>
+#include <audacious/i18n.h>
 
 #define MP4_VERSION	VERSION
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/adplug/adplug-xmms.cc	Mon Jan 22 18:41:17 2007 -0800
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
 #include "adplug.h"
 #include "emuopl.h"
 #include "silentopl.h"
@@ -31,6 +30,7 @@
 #include "audacious/plugin.h"
 #include "audacious/util.h"
 #include "audacious/configdb.h"
+#include <audacious/i18n.h>
 extern "C" {
 #include "audacious/output.h"
 }
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/alac/plugin.c
--- a/src/alac/plugin.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/alac/plugin.c	Mon Jan 22 18:41:17 2007 -0800
@@ -43,7 +43,7 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/alsa/alsa.h
--- a/src/alsa/alsa.h	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/alsa/alsa.h	Mon Jan 22 18:41:17 2007 -0800
@@ -27,7 +27,7 @@
 #include <audacious/configdb.h>
 #include <audacious/main.h>
 #include <audacious/plugin.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/audiocompress/audacious-glue.c
--- a/src/audiocompress/audacious-glue.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/audiocompress/audacious-glue.c	Mon Jan 22 18:41:17 2007 -0800
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include "audacious/plugin.h"
 #include "audacious/util.h"
 #include "audacious/configdb.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/blur_scope/blur_scope.c
--- a/src/blur_scope/blur_scope.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/blur_scope/blur_scope.c	Mon Jan 22 18:41:17 2007 -0800
@@ -25,7 +25,7 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
 #include "audacious/plugin.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/blur_scope/config.c
--- a/src/blur_scope/config.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/blur_scope/config.c	Mon Jan 22 18:41:17 2007 -0800
@@ -3,7 +3,7 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
 #include "audacious/configdb.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/cdaudio/cdaudio.c
--- a/src/cdaudio/cdaudio.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/cdaudio/cdaudio.c	Mon Jan 22 18:41:17 2007 -0800
@@ -25,7 +25,7 @@
 #include "cdaudio.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <glib/gprintf.h>
 #include <string.h>
 #include <stdlib.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/cdaudio/cdinfo.c
--- a/src/cdaudio/cdinfo.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/cdaudio/cdinfo.c	Mon Jan 22 18:41:17 2007 -0800
@@ -21,7 +21,7 @@
 #include "cdinfo.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/gi18n.h>
 #include <glib/gprintf.h>
 
 #include <audacious/rcfile.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/cdaudio/configure.c
--- a/src/cdaudio/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/cdaudio/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -22,7 +22,7 @@
 #include "cdaudio.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <glib/gprintf.h>
 #include <string.h>
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/console/Audacious_Config.cxx
--- a/src/console/Audacious_Config.cxx	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/console/Audacious_Config.cxx	Mon Jan 22 18:41:17 2007 -0800
@@ -9,7 +9,7 @@
  */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include "audacious/configdb.h"
 #include "Audacious_Config.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/console/Audacious_Driver.cxx	Mon Jan 22 18:41:17 2007 -0800
@@ -7,7 +7,7 @@
  */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include "audacious/util.h"
 #include "audacious/titlestring.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/disk_writer/disk_writer.c
--- a/src/disk_writer/disk_writer.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/disk_writer/disk_writer.c	Mon Jan 22 18:41:17 2007 -0800
@@ -24,7 +24,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <stdio.h>
 #include <string.h>
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/echo_plugin/echo.c
--- a/src/echo_plugin/echo.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/echo_plugin/echo.c	Mon Jan 22 18:41:17 2007 -0800
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include "audacious/configdb.h"
 #include "echo.h"
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/echo_plugin/gui.c
--- a/src/echo_plugin/gui.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/echo_plugin/gui.c	Mon Jan 22 18:41:17 2007 -0800
@@ -1,5 +1,5 @@
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include "audacious/util.h"
 #include "audacious/configdb.h"
 #include "echo.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/esd/about.c
--- a/src/esd/about.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/esd/about.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,7 +17,7 @@
 #include "esdout.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
 #include <audacious/util.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/esd/configure.c
--- a/src/esd/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/esd/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -22,7 +22,7 @@
 #include "esdout.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/esd/esd.c
--- a/src/esd/esd.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/esd/esd.c	Mon Jan 22 18:41:17 2007 -0800
@@ -18,7 +18,7 @@
 #include "esdout.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 
 OutputPlugin esd_op = {
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/evdev-plug/ed.c
--- a/src/evdev-plug/ed.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/evdev-plug/ed.c	Mon Jan 22 18:41:17 2007 -0800
@@ -24,7 +24,7 @@
 #include "ed_actions.h"
 #include "ed_ui.h"
 #include "ed_common.h"
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <audacious/beepctrl.h>
 
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/evdev-plug/ed_internals.c
--- a/src/evdev-plug/ed_internals.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/evdev-plug/ed_internals.c	Mon Jan 22 18:41:17 2007 -0800
@@ -37,7 +37,7 @@
 /* for variadic */
 #include <stdarg.h>
 
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 
 static gboolean ed_device_giofunc ( GIOChannel * , GIOCondition , gpointer );
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/evdev-plug/ed_ui.c
--- a/src/evdev-plug/ed_ui.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/evdev-plug/ed_ui.c	Mon Jan 22 18:41:17 2007 -0800
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <linux/input.h>
 
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/jack/jack.c
--- a/src/jack/jack.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/jack/jack.c	Mon Jan 22 18:41:17 2007 -0800
@@ -10,7 +10,7 @@
 #include "audacious/util.h"
 #include <dlfcn.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <stdio.h>
 #include "config.h"
 #include "bio2jack.h" /* includes for the bio2jack library */
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/lirc/about.c
--- a/src/lirc/about.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/lirc/about.c	Mon Jan 22 18:41:17 2007 -0800
@@ -28,7 +28,7 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
 #include "lirc.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/lirc/lirc.c
--- a/src/lirc/lirc.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/lirc/lirc.c	Mon Jan 22 18:41:17 2007 -0800
@@ -39,7 +39,7 @@
 #include <gtk/gtk.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include "audacious/plugin.h"
 #include "audacious/beepctrl.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/mpg123/configure.c
--- a/src/mpg123/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/mpg123/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -2,7 +2,7 @@
 #include "mpg123.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/mpg123/fileinfo.c
--- a/src/mpg123/fileinfo.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/mpg123/fileinfo.c	Mon Jan 22 18:41:17 2007 -0800
@@ -25,7 +25,7 @@
 #include "tag_c_hacked.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/mpg123/mpg123.c
--- a/src/mpg123/mpg123.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/mpg123/mpg123.c	Mon Jan 22 18:41:17 2007 -0800
@@ -2,7 +2,7 @@
 #include "common.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/mpg123/rtsp.c
--- a/src/mpg123/rtsp.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/mpg123/rtsp.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,7 +17,7 @@
  */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/null/null.c
--- a/src/null/null.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/null/null.c	Mon Jan 22 18:41:17 2007 -0800
@@ -21,7 +21,7 @@
  */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
 #include <audacious/util.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/paranormal/plugin.c
--- a/src/paranormal/plugin.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/paranormal/plugin.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/rovascope/plugin.c
--- a/src/rovascope/plugin.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/rovascope/plugin.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/scrobbler/configure.c
--- a/src/scrobbler/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/scrobbler/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -16,7 +16,7 @@
 #include "md5.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/scrobbler/gtkstuff.c
--- a/src/scrobbler/gtkstuff.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/scrobbler/gtkstuff.c	Mon Jan 22 18:41:17 2007 -0800
@@ -2,7 +2,7 @@
 #include "audacious/configdb.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include <stdio.h>
 #include <string.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/scrobbler/plugin.c
--- a/src/scrobbler/plugin.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/scrobbler/plugin.c	Mon Jan 22 18:41:17 2007 -0800
@@ -2,7 +2,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/song_change/song_change.c
--- a/src/song_change/song_change.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/song_change/song_change.c	Mon Jan 22 18:41:17 2007 -0800
@@ -5,7 +5,6 @@
 #include "config.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -21,6 +20,7 @@
 #include "audacious/configdb.h"
 #include "audacious/beepctrl.h"
 #include "audacious/formatter.h"
+#include <audacious/i18n.h>
 
 static void init(void);
 static void cleanup(void);
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/statusicon/gtktrayicon-x11.c
--- a/src/statusicon/gtktrayicon-x11.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/statusicon/gtktrayicon-x11.c	Mon Jan 22 18:41:17 2007 -0800
@@ -27,7 +27,7 @@
 #include "si_common.h"
 #include <string.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/gi18n.h>
 
 #include <gtk/gtkprivate.h>
 #include "gtktrayicon.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/statusicon/si_ui.c
--- a/src/statusicon/si_ui.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/statusicon/si_ui.c	Mon Jan 22 18:41:17 2007 -0800
@@ -27,8 +27,8 @@
 #include <audacious/titlestring.h>
 #include <audacious/ui_fileinfopopup.h>
 #include <audacious/util.h>
+#include <audacious/i18n.h>
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/stereo_plugin/stereo.c
--- a/src/stereo_plugin/stereo.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/stereo_plugin/stereo.c	Mon Jan 22 18:41:17 2007 -0800
@@ -1,5 +1,5 @@
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include "audacious/util.h"
 
 #include <audacious/plugin.h>
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/sun/about.c
--- a/src/sun/about.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/sun/about.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,11 +17,11 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <glib.h>
+
 #include "sun.h"
 #include "audacious/util.h"
-
-#include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 void sun_about(void)
 {
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/sun/configure.c
--- a/src/sun/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/sun/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,13 +17,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <glib.h>
+
 #include <errno.h>
+
 #include "sun.h"
 #include "audacious/util.h"
 #include "audacious/configdb.h"
-
-#include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 
 #include "mixer.h"
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/sun/sun.c
--- a/src/sun/sun.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/sun/sun.c	Mon Jan 22 18:41:17 2007 -0800
@@ -17,11 +17,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <glib.h>
+
 #include "sun.h"
 #include "audacious/configdb.h"
+#include <audacious/i18n.h>
 
-#include <glib.h>
-#include <glib/gi18n.h>
 #include <errno.h>
 
 struct sun_audio audio;
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/timidity/src/interface.c
--- a/src/timidity/src/interface.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/timidity/src/interface.c	Mon Jan 22 18:41:17 2007 -0800
@@ -12,10 +12,11 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include <audacious/i18n.h>
+
 #include "callbacks.h"
 #include "interface.h"
 #include "interface.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/timidity/src/xmms-timidity.c
--- a/src/timidity/src/xmms-timidity.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/timidity/src/xmms-timidity.c	Mon Jan 22 18:41:17 2007 -0800
@@ -26,12 +26,12 @@
 #include "audacious/titlestring.h"
 #include "audacious/vfs.h"
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
 #include <timidity.h>
 #include <stdio.h>
 #include "audacious/output.h"
+#include <audacious/i18n.h>
 
 #include "xmms-timidity.h"
 #include "interface.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/tonegen/tonegen.c
--- a/src/tonegen/tonegen.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/tonegen/tonegen.c	Mon Jan 22 18:41:17 2007 -0800
@@ -20,13 +20,13 @@
 #include "audacious/plugin.h"
 #include "audacious/output.h"
 #include "audacious/util.h"
+#include <audacious/i18n.h>
 #include "config.h"
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <stdio.h>
-#include <glib/gi18n.h>
 
 #define MIN_FREQ 10
 #define MAX_FREQ 20000
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/tta/aud-tta.c
--- a/src/tta/aud-tta.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/tta/aud-tta.c	Mon Jan 22 18:41:17 2007 -0800
@@ -36,7 +36,6 @@
 #include <sys/stat.h>
 #include <glib.h>
 #include <pthread.h>
-#include <glib/gi18n.h>
 #include <string.h>
 
 #include <audacious/util.h>
@@ -46,6 +45,7 @@
 #include "aud-support.h"
 #include <audacious/output.h>
 #include <audacious/strings.h>
+#include <audacious/i18n.h>
 
 #include <id3tag.h>
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/vorbis/configure.c
--- a/src/vorbis/configure.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/vorbis/configure.c	Mon Jan 22 18:41:17 2007 -0800
@@ -5,7 +5,6 @@
 #include "vorbis.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,6 +13,7 @@
 #include "audacious/titlestring.h"
 #include "audacious/util.h"
 #include "audacious/plugin.h"
+#include <audacious/i18n.h>
 
 extern GMutex *vf_mutex;
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/vorbis/fileinfo.c
--- a/src/vorbis/fileinfo.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/vorbis/fileinfo.c	Mon Jan 22 18:41:17 2007 -0800
@@ -26,7 +26,6 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
@@ -41,6 +40,7 @@
 #include "audacious/util.h"
 #include <audacious/util.h>
 #include <audacious/vfs.h>
+#include <audacious/i18n.h>
 
 #include "vorbis.h"
 #include "vcedit.h"
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/vorbis/vorbis.c	Mon Jan 22 18:41:17 2007 -0800
@@ -35,7 +35,6 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include <stdlib.h>
@@ -53,6 +52,7 @@
 #include "audacious/util.h"
 #include "audacious/configdb.h"
 #include "audacious/titlestring.h"
+#include <audacious/i18n.h>
 
 #include "vorbis.h"
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/wav/wav-sndfile.c
--- a/src/wav/wav-sndfile.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/wav/wav-sndfile.c	Mon Jan 22 18:41:17 2007 -0800
@@ -20,13 +20,13 @@
  */
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <string.h>
 #include <math.h>
 #include <stdio.h>
 
 #include <audacious/util.h>
 #include <audacious/titlestring.h>
+#include <audacious/i18n.h>
 #include "audacious/output.h"
 #include "wav-sndfile.h"
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/wav/wav.c
--- a/src/wav/wav.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/wav/wav.c	Mon Jan 22 18:41:17 2007 -0800
@@ -22,12 +22,12 @@
 #include "wav.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <string.h>
 
 #include <audacious/util.h>
 #include <audacious/titlestring.h>
 #include "audacious/output.h"
+#include <audacious/i18n.h>
 
 gchar *wav_fmts[] = { "wav", "raw", "pcm", NULL };
 
diff -r 5fa8b0ca6d61 -r d124034ebea3 src/wma/wma.c
--- a/src/wma/wma.c	Mon Jan 22 14:56:02 2007 -0800
+++ b/src/wma/wma.c	Mon Jan 22 18:41:17 2007 -0800
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <strings.h>
 #include <glib.h>
-#include <glib/gi18n.h>
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
@@ -39,6 +38,7 @@
 #include <audacious/titlestring.h>
 #include <audacious/vfs.h>
 #include <audacious/strings.h>
+#include <audacious/i18n.h>
 
 #include "avcodec.h"
 #include "avformat.h"