[beast/devel: 12/35] SFI: replace g_intern_printf with g_intern_format()

[Tim Janik <timj src gnome org>]

commit 752e17b888a4c3c9a85a360a1f04ba04ef339b6f
Author: Tim Janik <timj gnu org>
Date:   Sun May 12 19:23:45 2013 +0200

    SFI: replace g_intern_printf with g_intern_format()

 drivers/Makefile.am                             |    2 +-
 drivers/bse-portaudio/bsepcmdevice-portaudio.cc |    2 +-
 drivers/bsemididevice-alsa.cc                   |    2 +-
 drivers/bsepcmdevice-alsa.cc                    |    2 +-
 shell/bsescm.cc                                 |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index 3141324..4014636 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -9,7 +9,7 @@ AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 driversdir          = $(bsedriverdir)
 drivers_LTLIBRARIES = bsepcmdevice-alsa.la bsemididevice-alsa.la
 drivers_ldflags     = -avoid-version
-drivers_libs        = $(top_builddir)/bse/libbse.la $(BSE_LIBS)
+drivers_libs        = $(top_builddir)/bse/libbse.la $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
 EXTRA_DIST=
 
 # Plugin bsepcmdevice-alsa
diff --git a/drivers/bse-portaudio/bsepcmdevice-portaudio.cc b/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
index 0e6e7d2..5091d53 100644
--- a/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
+++ b/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
@@ -376,7 +376,7 @@ bse_pcm_device_port_audio_class_init (BsePcmDevicePortAudioClass *klass)
   device_class->list_devices = bse_pcm_device_port_audio_list_devices;
   const gchar *name = "portaudio";
   const gchar *syntax = _("DEVICE,MODE");
-  const gchar *info = g_intern_printf (/* TRANSLATORS: keep this text to 70 chars in width */
+  const gchar *info = g_intern_format (/* TRANSLATORS: keep this text to 70 chars in width */
                                        _("PortAudio PCM driver, using %s.\n"
                                          "  DEVICE - the PortAudio device to use, 'default' selects default 
device\n"
                                          "  MODE   - rw = read/write, ro = readonly, wo = writeonly\n"),
diff --git a/drivers/bsemididevice-alsa.cc b/drivers/bsemididevice-alsa.cc
index 81839fa..2331f73 100644
--- a/drivers/bsemididevice-alsa.cc
+++ b/drivers/bsemididevice-alsa.cc
@@ -327,7 +327,7 @@ bse_midi_device_alsa_class_init (BseMidiDeviceALSAClass *klass)
   device_class->list_devices = bse_midi_device_alsa_list_devices;
   const gchar *name = "alsa";
   const gchar *syntax = _("PLUGIN:CARD,DEV,SUBDEV");
-  const gchar *info = g_intern_printf (/* TRANSLATORS: keep this text to 70 chars in width */
+  const gchar *info = g_intern_format (/* TRANSLATORS: keep this text to 70 chars in width */
                                        _("Advanced Linux Sound Architecture MIDI driver, using\n"
                                          "ALSA %s.\n"
                                          "The device specification follows the ALSA device naming\n"
diff --git a/drivers/bsepcmdevice-alsa.cc b/drivers/bsepcmdevice-alsa.cc
index e49935c..ecba2c5 100644
--- a/drivers/bsepcmdevice-alsa.cc
+++ b/drivers/bsepcmdevice-alsa.cc
@@ -579,7 +579,7 @@ bse_pcm_device_alsa_class_init (BsePcmDeviceALSAClass *klass)
   device_class->list_devices = bse_pcm_device_alsa_list_devices;
   const gchar *name = "alsa";
   const gchar *syntax = _("PLUGIN:CARD,DEV,SUBDEV");
-  const gchar *info = g_intern_printf (/* TRANSLATORS: keep this text to 70 chars in width */
+  const gchar *info = g_intern_format (/* TRANSLATORS: keep this text to 70 chars in width */
                                        _("Advanced Linux Sound Architecture PCM driver, using\n"
                                          "ALSA %s.\n"
                                          "The device specification follows the ALSA device naming\n"
diff --git a/shell/bsescm.cc b/shell/bsescm.cc
index 6b5e355..f660803 100644
--- a/shell/bsescm.cc
+++ b/shell/bsescm.cc
@@ -105,7 +105,7 @@ gh_main (int   argc,
   bse_scm_interp_init ();
 
   /* exec Bse Scheme bootup code */
-  const gchar *boot_script = g_intern_printf ("%s/%s", boot_script_path, "bse-scm-glue.boot");
+  const gchar *boot_script = g_intern_format ("%s/%s", boot_script_path, "bse-scm-glue.boot");
   gh_load (boot_script);
 
   /* eval, auto-play or interactive */