changeset 1302:1d3b02d1842b

Guess... Yes, "i18n" stuff.
author Stany HENRY <StrassBoy@gmail.com>
date Thu, 19 Jul 2007 23:43:00 +0200
parents df5d07d7ca7c
children 2a7c9e0b9c0f 43dbcf08bd7a
files src/ladspa/ladspa.c src/madplug/configure.c src/madplug/fileinfo.c src/madplug/plugin.c src/modplug/gui/interface.cxx
diffstat 5 files changed, 69 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/src/ladspa/ladspa.c	Thu Jul 19 20:59:31 2007 +0100
+++ b/src/ladspa/ladspa.c	Thu Jul 19 23:43:00 2007 +0200
@@ -29,6 +29,7 @@
 
 #include <audacious/plugin.h>
 #include <audacious/configdb.h>
+#include <audacious/i18n.h>
 
 #include "../../config.h"
 #include "ladspa.h"
@@ -217,7 +218,7 @@
   plugin_instance *instance;
 
   instance = g_new0(plugin_instance, 1);
-  
+
   instance->filename = filename;
   instance->library = dlopen(filename, RTLD_NOW);
   if (instance->library == NULL) {
@@ -442,7 +443,7 @@
         if (instance->handle2)
           plugin->connect_port(instance->handle2, port, trash);
       }
-      
+
     } else if (LADSPA_IS_PORT_AUDIO(plugin->PortDescriptors[port])) {
 
       if (LADSPA_IS_PORT_INPUT(plugin->PortDescriptors[port])) {
@@ -490,7 +491,7 @@
   struct dirent *dirent;
   long int k;
   unsigned long int port, input, output;
-  
+
   dir= opendir(path_entry);
   if (dir == NULL) return;
 
@@ -720,7 +721,7 @@
   }
 
   if (no_ui) {
-    widget = gtk_label_new("This LADSPA plugin has no user controls");
+    widget = gtk_label_new(_("This LADSPA plugin has no user controls"));
     gtk_container_add(GTK_CONTAINER(vbox), widget);
   }
 
@@ -765,7 +766,7 @@
 
 static void make_run_clist(void)
 {
-  char * titles[1] = { "Name" };
+  char * titles[1] = { _("Name") };
   GSList *list;
 
   run_clist = gtk_clist_new_with_titles(1, titles);
@@ -851,10 +852,10 @@
   GSList *list;
   GtkWidget *clist;
   char number[14];
-  char * titles[2] = { "UID", "Name" };
+  char * titles[2] = { _("UID"), _("Name") };
   char * line[2];
   gint row;
-  
+
   find_all_plugins();
 
   clist = gtk_clist_new_with_titles(2, titles);
@@ -926,7 +927,7 @@
   vbox= gtk_vbox_new(FALSE, 0);
   hbox= gtk_hbox_new(TRUE, 0);
 
-  frame= gtk_frame_new("Installed plugins");
+  frame= gtk_frame_new(_("Installed plugins"));
   widget = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
                                  GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
@@ -935,7 +936,7 @@
   gtk_container_add(GTK_CONTAINER(hbox), frame);
 
 
-  frame= gtk_frame_new("Running plugins");
+  frame= gtk_frame_new(_("Running plugins"));
   widget = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
                                  GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
@@ -950,15 +951,15 @@
   /* Buttons */
   bbox = gtk_hbutton_box_new();
   gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
-  widget = gtk_button_new_with_label("Add");
+  widget = gtk_button_new_with_label(_("Add"));
   g_signal_connect(G_OBJECT(widget), "clicked",
                      G_CALLBACK(add_plugin_clicked), NULL);
   gtk_box_pack_end_defaults(GTK_BOX(bbox), widget);
-  widget = gtk_button_new_with_label("Remove");
+  widget = gtk_button_new_with_label(_("Remove"));
   g_signal_connect(G_OBJECT(widget), "clicked",
                      G_CALLBACK(remove_plugin_clicked), NULL);
   gtk_box_pack_end_defaults(GTK_BOX(bbox), widget);
-  widget = gtk_button_new_with_label("Configure");
+  widget = gtk_button_new_with_label(_("Configure"));
   g_signal_connect(G_OBJECT(widget), "clicked",
                      G_CALLBACK(configure_plugin_clicked), NULL);
   gtk_box_pack_end_defaults(GTK_BOX(bbox), widget);
@@ -967,7 +968,7 @@
 
   gtk_container_add(GTK_CONTAINER(config_window), vbox);
 
-  gtk_window_set_title(GTK_WINDOW(config_window), "LADSPA Plugin Catalog");
+  gtk_window_set_title(GTK_WINDOW(config_window), _("LADSPA Plugin Catalog"));
   gtk_widget_set_usize(config_window, 380, 400);
   g_signal_connect (G_OBJECT (config_window), "delete_event",
                       G_CALLBACK (gtk_widget_hide_on_delete), NULL);
--- a/src/madplug/configure.c	Thu Jul 19 20:59:31 2007 +0100
+++ b/src/madplug/configure.c	Thu Jul 19 23:43:00 2007 +0200
@@ -51,7 +51,7 @@
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sjis));
     audmad_config.show_avg_vbr_bitrate =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(show_avg));
-    audmad_config.force_reopen_audio = 
+    audmad_config.force_reopen_audio =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(reopen));
 
     audmad_config.replaygain.enable =
@@ -174,7 +174,7 @@
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_xing),
                                  audmad_config.use_xing);
 
-    sjis = gtk_check_button_new_with_label("Use SJIS to write ID3 tags instead of UTF-8");
+    sjis = gtk_check_button_new_with_label(_("Use SJIS to write ID3 tags instead of UTF-8"));
     gtk_box_pack_start(GTK_BOX(vbox2), sjis, TRUE, TRUE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sjis), audmad_config.sjis);
 
@@ -230,7 +230,7 @@
     gtk_box_pack_start(GTK_BOX(pregain_hbox), label, FALSE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(pregain_hbox), pregain, FALSE, TRUE, 0);
 
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new("ReplayGain"));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("ReplayGain")));
 
     vbox2 = gtk_vbox_new(FALSE, 5);
 
--- a/src/madplug/fileinfo.c	Thu Jul 19 20:59:31 2007 +0100
+++ b/src/madplug/fileinfo.c	Thu Jul 19 23:43:00 2007 +0200
@@ -99,7 +99,7 @@
     field = id3_frame_field(frame, 0);
     id3_field_settextencoding(field, audmad_config.sjis ? ID3_FIELD_TEXTENCODING_ISO_8859_1 :
 			      ID3_FIELD_TEXTENCODING_UTF_8);
-        
+
     // setup genre code
     if (!strcmp(frame_name, ID3_FRAME_GENRE)) {
         char *tmp;
@@ -116,7 +116,7 @@
             tmp = g_strdup_printf("%d", index);
             ucs4 = id3_latin1_ucs4duplicate((unsigned char *) tmp);
         }
-        
+
     }
 
     // write string
@@ -154,7 +154,7 @@
     /* read tag from file */
     id3file = id3_file_open(info.filename, ID3_FILE_MODE_READWRITE);
     if (!id3file) {
-        xmms_show_message("File Info", "Couldn't open file!", "Ok",
+        xmms_show_message(_("File Info"), _("Couldn't open file!"), _("Ok"),
                           FALSE, NULL, NULL);
         return;
     }
@@ -176,7 +176,7 @@
 
     text = gtk_editable_get_chars(GTK_EDITABLE(title_entry), 0, -1);
     text2 = g_convert(text, strlen(text), encoding, "UTF-8", NULL, NULL, NULL);
-    
+
     update_id3_frame(id3tag, ID3_FRAME_TITLE, text2);
     free(text);
     free(text2);
@@ -232,7 +232,7 @@
     printf("about to write id3tag\n");
 #endif
     if (id3_file_update(id3file) != 0) {
-        xmms_show_message("File Info", "Couldn't write tag!", "Ok", FALSE,
+        xmms_show_message(_("File Info"), _("Couldn't write tag!"), _("Ok"), FALSE,
                           NULL, NULL);
     }
     id3_file_close(id3file);
@@ -309,7 +309,7 @@
     gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE,
                        0);
 
-    label = gtk_label_new("<b>Name:</b>");
+    label = gtk_label_new(_("<b>Name:</b>"));
     gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
     gtk_box_pack_start(GTK_BOX(filename_hbox), label, FALSE, TRUE, 0);
     filename_entry = gtk_entry_new();
@@ -404,7 +404,7 @@
     gtk_container_set_border_width(GTK_CONTAINER(table), 5);
     gtk_container_add(GTK_CONTAINER(id3_frame), table);
 
-    label = gtk_label_new("Title:");
+    label = gtk_label_new(_("Title:"));
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
     gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL,
                      GTK_FILL, 5, 5);
@@ -414,7 +414,7 @@
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK,
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
 
-    label = gtk_label_new("Artist:");
+    label = gtk_label_new(_("Artist:"));
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
     gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL,
                      GTK_FILL, 5, 5);
@@ -424,7 +424,7 @@
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK,
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
 
-    label = gtk_label_new("Album:");
+    label = gtk_label_new(_("Album:"));
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
     gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL,
                      GTK_FILL, 5, 5);
@@ -434,7 +434,7 @@
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK,
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
 
-    label = gtk_label_new("Comment:");
+    label = gtk_label_new(_("Comment:"));
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
     gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, GTK_FILL,
                      GTK_FILL, 5, 5);
@@ -444,7 +444,7 @@
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK,
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
 
-    label = gtk_label_new("Year:");
+    label = gtk_label_new(_("Year:"));
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
     gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, GTK_FILL,
                      GTK_FILL, 5, 5);
@@ -455,7 +455,7 @@
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK,
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
 
-    label = gtk_label_new("Track number:");
+    label = gtk_label_new(_("Track number:"));
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
     gtk_table_attach(GTK_TABLE(table), label, 2, 3, 4, 5, GTK_FILL,
                      GTK_FILL, 5, 5);
@@ -466,7 +466,7 @@
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK,
                      GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
 
-    label = gtk_label_new("Genre:");
+    label = gtk_label_new(_("Genre:"));
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
     gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, GTK_FILL,
                      GTK_FILL, 5, 5);
@@ -479,7 +479,7 @@
         const id3_ucs4_t *ucs4 = id3_genre_index(i);
 
         //add "Unknown" to the first. we must shift index.
-        genre_list = g_list_append(genre_list, "Unknown");
+        genre_list = g_list_append(genre_list, _("Unknown"));
 
         while (ucs4) {
             genre_list =
@@ -520,7 +520,7 @@
                              G_CALLBACK(change_buttons), save);
     g_signal_connect_swapped(G_OBJECT(tracknum_entry), "changed",
                              G_CALLBACK(change_buttons), save);
-        
+
     g_signal_connect_swapped(G_OBJECT(GTK_COMBO(genre_combo)->entry), "changed",
                                  G_CALLBACK(change_buttons), save);
 
@@ -608,7 +608,7 @@
     info.fileinfo_request = TRUE;
     input_get_info(&info, info.remote ? TRUE : FALSE);
 
-    title = g_strdup_printf("File Info - %s", g_basename(utf_filename));
+    title = g_strdup_printf(_("File Info - %s"), g_basename(utf_filename));
     gtk_window_set_title(GTK_WINDOW(window), title);
     g_free(title);
 
@@ -638,19 +638,19 @@
 
     id3_frame_to_entry(ID3_FRAME_TRACK, GTK_ENTRY(tracknum_entry));
     id3_frame_to_entry(ID3_FRAME_COMMENT, GTK_ENTRY(comment_entry));
-    snprintf(message, 127, "Layer %s", layer_str[info.mpeg_layer - 1]);
+    snprintf(message, 127, _("Layer %s"), layer_str[info.mpeg_layer - 1]);
     gtk_label_set_text(GTK_LABEL(mpeg_level), message);
     if (info.vbr) {
-        snprintf(message, 127, "VBR (avg. %d kbps)", info.bitrate / 1000);
+        snprintf(message, 127, _("VBR (avg. %d kbps)"), info.bitrate / 1000);
     }
     else {
         snprintf(message, 127, "%d kbps", info.bitrate / 1000);
     }
     gtk_label_set_text(GTK_LABEL(mpeg_bitrate), message);
-    snprintf(message, 127, "%d Hz", info.freq);
+    snprintf(message, 127, _("%d Hz"), info.freq);
     gtk_label_set_text(GTK_LABEL(mpeg_samplerate), message);
     if (info.frames != -1) {
-        snprintf(message, 127, "%d frames", info.frames);
+        snprintf(message, 127, _("%d frames"), info.frames);
         gtk_label_set_text(GTK_LABEL(mpeg_frames), message);
     }
     else {
@@ -659,12 +659,12 @@
     gtk_label_set_text(GTK_LABEL(mpeg_flags), mode_str[info.mode]);
     {
         guint sec = mad_timer_count(info.duration, MAD_UNITS_SECONDS);
-        snprintf(message, 127, "%d:%02d (%d seconds)", sec /60 ,sec % 60, sec);
+        snprintf(message, 127, _("%d:%02d (%d seconds)"), sec /60 ,sec % 60, sec);
     }
     gtk_label_set_text(GTK_LABEL(mpeg_duration), message);
 
     if (info.replaygain_album_str != NULL) {
-        snprintf(message, 127, "RG_album=%4s (x%4.2f)",
+        snprintf(message, 127, _("RG_album=%4s (x%4.2f)"),
                  info.replaygain_album_str, info.replaygain_album_scale);
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain), message);
     }
@@ -672,7 +672,7 @@
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain), "");
 
     if (info.replaygain_track_str != NULL) {
-        snprintf(message, 127, "RG_track=%4s (x%4.2f)",
+        snprintf(message, 127, _("RG_track=%4s (x%4.2f)"),
                  info.replaygain_track_str, info.replaygain_track_scale);
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain2), message);
     }
@@ -680,7 +680,7 @@
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain2), "");
 
     if (info.replaygain_album_peak_str != NULL) {
-        snprintf(message, 127, "Peak album=%4s (%+5.3fdBFS)",
+        snprintf(message, 127, _("Peak album=%4s (%+5.3fdBFS)"),
                  info.replaygain_album_peak_str,
                  20 * log10(info.replaygain_album_peak));
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain3), message);
@@ -689,7 +689,7 @@
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain3), "");
 
     if (info.replaygain_track_peak_str != NULL) {
-        snprintf(message, 127, "Peak track=%4s (%+5.3fdBFS)",
+        snprintf(message, 127, _("Peak track=%4s (%+5.3fdBFS)"),
                  info.replaygain_track_peak_str,
                  20 * log10(info.replaygain_track_peak));
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain4), message);
@@ -698,7 +698,7 @@
         gtk_label_set_text(GTK_LABEL(mpeg_replaygain3), "");
 
     if (info.mp3gain_undo_str != NULL) {
-        snprintf(message, 127, "mp3gain undo=%4s (%+5.3fdB)",
+        snprintf(message, 127, _("mp3gain undo=%4s (%+5.3fdB)"),
                  info.mp3gain_undo_str, info.mp3gain_undo);
         gtk_label_set_text(GTK_LABEL(mp3gain1), message);
     }
@@ -706,7 +706,7 @@
         gtk_label_set_text(GTK_LABEL(mp3gain1), "");
 
     if (info.mp3gain_minmax_str != NULL) {
-        snprintf(message, 127, "mp3gain minmax=%4s (max-min=%+6.3fdB)",
+        snprintf(message, 127, _("mp3gain minmax=%4s (max-min=%+6.3fdB)"),
                  info.mp3gain_minmax_str, info.mp3gain_minmax);
         gtk_label_set_text(GTK_LABEL(mp3gain2), message);
     }
--- a/src/madplug/plugin.c	Thu Jul 19 20:59:31 2007 +0100
+++ b/src/madplug/plugin.c	Thu Jul 19 23:43:00 2007 +0200
@@ -89,7 +89,7 @@
 
 void audmad_config_compute(struct audmad_config_t *config)
 {
-    /* set some config parameters by parsing text fields 
+    /* set some config parameters by parsing text fields
        (RG default gain, etc..)
      */
     const gchar *text;
@@ -218,7 +218,7 @@
     sampleIndex = (head >> 10) & 0x3;
     if (sampleIndex == 0x3)
         return FALSE;
-    
+
     /* check version bits (19-20) and get bitRate */
     version = (head >> 19) & 0x03;
     switch (version) {
@@ -229,22 +229,22 @@
             else
                 bitRate = mp3_bitrate_table[4][bitIndex];
             break;
-             
+
         case 1: /* 01 = reserved */
             return FALSE;
-        
+
         case 3: /* 11 = MPEG Version 1 */
             bitRate = mp3_bitrate_table[layer][bitIndex];
             break;
-        
+
         default:
             return FALSE;
     }
-    
+
     /* check layer II restrictions vs. bitrate */
     if (layer == 2) {
         gint chanMode = (head >> 6) & 0x3;
-        
+
         if (chanMode == 0x3) {
             /* single channel with bitrate > 192 */
             if (bitRate > 192)
@@ -258,15 +258,15 @@
                 return FALSE;
         }
     }
-    
+
     /* calculate approx. frame size */
     padding = (head >> 9) & 1;
     sampleRate = mp3_samplerate_table[version][sampleIndex];
     if (layer == 1)
-        *frameSize = ((12 * bitRate * 1000 / sampleRate) + padding) * 4; 
+        *frameSize = ((12 * bitRate * 1000 / sampleRate) + padding) * 4;
     else
         *frameSize = (144 * bitRate * 1000) / (sampleRate + padding);
-    
+
     /* check if bits 16 - 19 are all set (MPEG 1 Layer I, not protected?) */
     if (((head >> 19) & 1) == 1 &&
         ((head >> 17) & 3) == 3 && ((head >> 16) & 1) == 1)
@@ -288,9 +288,9 @@
 
 gboolean audmad_is_remote(gchar *url)
 {
-    if (!strncasecmp("http://", url, 7) 
+    if (!strncasecmp("http://", url, 7)
         || !strncasecmp("https://", url, 8)
-        || !strncasecmp("lastfm://", url, 9)) 
+        || !strncasecmp("lastfm://", url, 9))
         return TRUE;
     else
         return FALSE;
@@ -313,7 +313,7 @@
 
     /* I've seen some flac files beginning with id3 frames..
        so let's exclude known non-mp3 filename extensions */
-    if ((ext != NULL) && 
+    if ((ext != NULL) &&
         (!strcasecmp("flac", ext) || !strcasecmp("mpc", ext) ||
          !strcasecmp("tta", ext)  || !strcasecmp("ogg", ext) ||
          !strcasecmp("wma", ext) )
@@ -342,7 +342,7 @@
     {
         vfs_fseek(fin, 4, SEEK_CUR);
         if(vfs_fread(buf, 1, 4, fin) == 0) {
-            gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);            
+            gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
             g_message("vfs_fread failed @2 %s", tmp);
             g_free(tmp);
             return 0;
@@ -458,9 +458,9 @@
     if (rtn == FALSE) {
         g_message("error reading input info");
         /*
-         * return; 
-         * commenting this return seems to be a hacky fix for the damn lastfm plugin playback 
-         * that used to work only for nenolod because of his fsck-ing lastfm subscription :p 
+         * return;
+         * commenting this return seems to be a hacky fix for the damn lastfm plugin playback
+         * that used to work only for nenolod because of his fsck-ing lastfm subscription :p
         */
     }
     g_mutex_lock(pb_mutex);
@@ -542,7 +542,7 @@
         return;
 
     scratch = g_strdup_printf(
-	"Audacious MPEG Audio Plugin\n"
+	_("Audacious MPEG Audio Plugin\n"
 	"\n"
 	"Compiled against libMAD version: %d.%d.%d%s\n"
 	"\n"
@@ -554,13 +554,13 @@
 	"    Sam Clegg\n"
 	"\n"
 	"ReplayGain support by:\n"
-	"    Samuel Krempp",
+	"    Samuel Krempp"),
 	MAD_VERSION_MAJOR, MAD_VERSION_MINOR, MAD_VERSION_PATCH,
 	MAD_VERSION_EXTRA);
 
-    aboutbox = xmms_show_message("About MPEG Audio Plugin",
+    aboutbox = xmms_show_message(_("About MPEG Audio Plugin"),
                                  scratch,
-                                 "Ok", FALSE, NULL, NULL);
+                                 _("Ok"), FALSE, NULL, NULL);
 
     g_free(scratch);
 
@@ -583,7 +583,7 @@
         va_end(args);
         GDK_THREADS_ENTER();
         error_dialog =
-            xmms_show_message("Error", string, "Ok", FALSE, 0, 0);
+            xmms_show_message(_("Error"), string, _("Ok"), FALSE, 0, 0);
         gtk_signal_connect(GTK_OBJECT(error_dialog), "destroy",
                            GTK_SIGNAL_FUNC(gtk_widget_destroyed),
                            &error_dialog);
@@ -693,7 +693,7 @@
                 tuple->length = atoi(string);
 #ifdef DEBUG
                 g_message("get_song_tuple: TLEN = %d", tuple->length);
-#endif	
+#endif
                 g_free(string);
                 string = NULL;
             }
--- a/src/modplug/gui/interface.cxx	Thu Jul 19 20:59:31 2007 +0100
+++ b/src/modplug/gui/interface.cxx	Thu Jul 19 23:43:00 2007 +0200
@@ -113,7 +113,7 @@
 
   Config = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_object_set_data (GTK_OBJECT (Config), "Config", Config);
-  gtk_widget_set_usize (Config, 350, -2);
+  gtk_widget_set_usize (Config, -1, -1);
   gtk_window_set_title (GTK_WINDOW (Config), _("ModPlug Configuration"));
   gtk_window_set_policy (GTK_WINDOW (Config), FALSE, FALSE, FALSE);
 
@@ -789,7 +789,7 @@
 
   Info = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_object_set_data (GTK_OBJECT (Info), "Info", Info);
-  gtk_widget_set_usize (Info, 290, 264);
+  gtk_widget_set_usize (Info, -1, 264);
   gtk_window_set_title (GTK_WINDOW (Info), _("MOD Info"));
 
   vbox14 = gtk_vbox_new (FALSE, 0);