Merge remote branch 'rbrito/fixes'

102 files changed, 15 insertions, 9 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 02dd02e..02dd02e 100755..100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index d4ed141..d4ed141 100755..100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
diff --git a/src/about.c b/src/about.c
index e57f31f..e57f31f 100755..100644
--- a/src/about.c
+++ b/src/about.c
diff --git a/src/about.h b/src/about.h
index 1fb4c25..1fb4c25 100755..100644
--- a/src/about.h
+++ b/src/about.h
diff --git a/src/ape_tag.c b/src/ape_tag.c
index fa0de5d..fa0de5d 100755..100644
--- a/src/ape_tag.c
+++ b/src/ape_tag.c
diff --git a/src/ape_tag.h b/src/ape_tag.h
index 1d21acb..1d21acb 100755..100644
--- a/src/ape_tag.h
+++ b/src/ape_tag.h
diff --git a/src/base64.c b/src/base64.c
index 6407a0e..6407a0e 100755..100644
--- a/src/base64.c
+++ b/src/base64.c
diff --git a/src/base64.h b/src/base64.h
index f0ddea4..f0ddea4 100755..100644
--- a/src/base64.h
+++ b/src/base64.h
diff --git a/src/browser.c b/src/browser.c
index 7c86a41..7c86a41 100755..100644
--- a/src/browser.c
+++ b/src/browser.c
diff --git a/src/cddb.c b/src/cddb.c
index a150fce..d60220e 100755..100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -223,7 +223,6 @@ void Open_Cddb_Window (void)
     GtkWidget *Button;
     GtkWidget *Separator;
     GtkWidget *ScrollWindow;
-    GtkWidget *PopupMenu;
     GtkWidget *Icon;
     GtkTooltips *Tips;
     gchar *CddbAlbumList_Titles[] = { NULL, N_("Artist / Album"), N_("Category")}; // Note: don't set "" instead of NULL else this will cause problem with translation language
@@ -704,9 +703,6 @@ void Open_Cddb_Window (void)
         "your files list. All lines will be processed if no line is selected.\n"
         "You can also reorder lines in this list before using 'apply' button."), NULL);
 
-    // Create Popup Menu on CddbTrackCList
-    PopupMenu = Create_Cddb_Track_List_Popup_Menu(CddbTrackListView);
-
     /*
      * Apply results to fields...
      */
@@ -1802,6 +1798,7 @@ gint Cddb_Read_Line (FILE **file, gchar **cddb_out)
 {
     gchar  buffer[MAX_STRING_LEN];
     gchar *result;
+    size_t l;
 
     if (*file == NULL)
     {
@@ -1831,12 +1828,16 @@ gint Cddb_Read_Line (FILE **file, gchar **cddb_out)
     }
 
     result = fgets(buffer,sizeof(buffer),*file);
-    if (result != NULL && result != (gchar *)EOF)
+    if (result != NULL)
     {
-        if (buffer && strlen(buffer)>0 && buffer[strlen(buffer)-1]=='\n')
-            buffer[strlen(buffer)-1]='\0';
-        while (buffer && strlen(buffer)>0 && buffer[strlen(buffer)-1]=='\r') // Severals chars '\r' may be present
-            buffer[strlen(buffer)-1]='\0';
+	l = strlen(buffer);
+        if (l > 0 && buffer[l-1] == '\n')
+            buffer[l-1] = '\0';
+
+	// Many '\r' chars may be present
+        while ((l = strlen(buffer)) > 0 && buffer[l-1] == '\r')
+            buffer[l-1] = '\0';
+
         *cddb_out = g_strdup(buffer);
     }else
     {
@@ -2231,6 +2232,7 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
     {
         g_free(string);
         g_free(cddb_server_name);
+	g_free(cddb_server_cgi_path);
         return FALSE;
     }
 
@@ -2551,6 +2553,7 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
         {
             g_free(string);
             g_free(cddb_server_name);
+            g_free(cddb_server_cgi_path);
             gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchButton),FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchAutoButton),FALSE);
             return FALSE;
@@ -3107,6 +3110,9 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
             if ( (socket_id=Cddb_Open_Connection(CDDB_USE_PROXY?CDDB_PROXY_NAME:cddb_server_name,
                                                  CDDB_USE_PROXY?CDDB_PROXY_PORT:cddb_server_port)) <= 0 )
             {
+                g_free(cddb_in);
+                g_free(cddb_server_name);
+                g_free(cddb_server_cgi_path);
                 return FALSE;
             }
 
diff --git a/src/cddb.h b/src/cddb.h
index 9bcfd69..9bcfd69 100755..100644
--- a/src/cddb.h
+++ b/src/cddb.h
diff --git a/src/charset.c b/src/charset.c
index b00af23..b00af23 100755..100644
--- a/src/charset.c
+++ b/src/charset.c
diff --git a/src/charset.h b/src/charset.h
index 7613628..7613628 100755..100644
--- a/src/charset.h
+++ b/src/charset.h
diff --git a/src/crc32.c b/src/crc32.c
index bd68609..bd68609 100755..100644
--- a/src/crc32.c
+++ b/src/crc32.c
diff --git a/src/crc32.h b/src/crc32.h
index 7f29a70..7f29a70 100755..100644
--- a/src/crc32.h
+++ b/src/crc32.h
diff --git a/src/dlm.c b/src/dlm.c
index 19c14e3..19c14e3 100755..100644
--- a/src/dlm.c
+++ b/src/dlm.c
diff --git a/src/dlm.h b/src/dlm.h
index 1ef23fd..1ef23fd 100755..100644
--- a/src/dlm.h
+++ b/src/dlm.h
diff --git a/src/easytag.c b/src/easytag.c
index 94c1d60..94c1d60 100755..100644
--- a/src/easytag.c
+++ b/src/easytag.c
diff --git a/src/easytag.h b/src/easytag.h
index 9823c75..9823c75 100755..100644
--- a/src/easytag.h
+++ b/src/easytag.h
diff --git a/src/et_core.c b/src/et_core.c
index 567a4bf..567a4bf 100755..100644
--- a/src/et_core.c
+++ b/src/et_core.c
diff --git a/src/et_core.h b/src/et_core.h
index 63f9565..63f9565 100755..100644
--- a/src/et_core.h
+++ b/src/et_core.h
diff --git a/src/flac_header.c b/src/flac_header.c
index acdf628..acdf628 100755..100644
--- a/src/flac_header.c
+++ b/src/flac_header.c
diff --git a/src/flac_header.h b/src/flac_header.h
index 7a7665f..7a7665f 100755..100644
--- a/src/flac_header.h
+++ b/src/flac_header.h
diff --git a/src/flac_tag.c b/src/flac_tag.c
index d8abf2f..d8abf2f 100755..100644
--- a/src/flac_tag.c
+++ b/src/flac_tag.c
diff --git a/src/flac_tag.h b/src/flac_tag.h
index 99ad489..99ad489 100755..100644
--- a/src/flac_tag.h
+++ b/src/flac_tag.h
diff --git a/src/genres.h b/src/genres.h
index 24f297b..24f297b 100755..100644
--- a/src/genres.h
+++ b/src/genres.h
diff --git a/src/id3_tag.c b/src/id3_tag.c
index 61c95c0..61c95c0 100755..100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
diff --git a/src/id3_tag.h b/src/id3_tag.h
index 755668b..755668b 100755..100644
--- a/src/id3_tag.h
+++ b/src/id3_tag.h
diff --git a/src/id3lib/Makefile.am b/src/id3lib/Makefile.am
index 17c011b..17c011b 100755..100644
--- a/src/id3lib/Makefile.am
+++ b/src/id3lib/Makefile.am
diff --git a/src/id3lib/c_wrapper.cpp b/src/id3lib/c_wrapper.cpp
index 1f56147..1f56147 100755..100644
--- a/src/id3lib/c_wrapper.cpp
+++ b/src/id3lib/c_wrapper.cpp
diff --git a/src/id3lib/id3_bugfix.h b/src/id3lib/id3_bugfix.h
index 74e7351..74e7351 100755..100644
--- a/src/id3lib/id3_bugfix.h
+++ b/src/id3lib/id3_bugfix.h
diff --git a/src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
index b05d2cf..b05d2cf 100755..100644
--- a/src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+++ b/src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index 29cbb1f..29cbb1f 100755..100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
diff --git a/src/libapetag/COPYING.LGPL b/src/libapetag/COPYING.LGPL
index cf9b6b9..cf9b6b9 100755..100644
--- a/src/libapetag/COPYING.LGPL
+++ b/src/libapetag/COPYING.LGPL
diff --git a/src/libapetag/Makefile.am b/src/libapetag/Makefile.am
index 61b0f9c..61b0f9c 100755..100644
--- a/src/libapetag/Makefile.am
+++ b/src/libapetag/Makefile.am
diff --git a/src/libapetag/README.apetag b/src/libapetag/README.apetag
index 9b3d311..9b3d311 100755..100644
--- a/src/libapetag/README.apetag
+++ b/src/libapetag/README.apetag
diff --git a/src/libapetag/apetaglib.c b/src/libapetag/apetaglib.c
index 52fc971..52fc971 100755..100644
--- a/src/libapetag/apetaglib.c
+++ b/src/libapetag/apetaglib.c
diff --git a/src/libapetag/apetaglib.h b/src/libapetag/apetaglib.h
index 15ec6e9..15ec6e9 100755..100644
--- a/src/libapetag/apetaglib.h
+++ b/src/libapetag/apetaglib.h
diff --git a/src/libapetag/id3v2_read.c b/src/libapetag/id3v2_read.c
index f4c8a64..f4c8a64 100755..100644
--- a/src/libapetag/id3v2_read.c
+++ b/src/libapetag/id3v2_read.c
diff --git a/src/libapetag/id3v2_read.h b/src/libapetag/id3v2_read.h
index 16d433d..16d433d 100755..100644
--- a/src/libapetag/id3v2_read.h
+++ b/src/libapetag/id3v2_read.h
diff --git a/src/libapetag/info_mac.c b/src/libapetag/info_mac.c
index 1b8b5e2..1b8b5e2 100755..100644
--- a/src/libapetag/info_mac.c
+++ b/src/libapetag/info_mac.c
diff --git a/src/libapetag/info_mac.h b/src/libapetag/info_mac.h
index a17e47c..a17e47c 100755..100644
--- a/src/libapetag/info_mac.h
+++ b/src/libapetag/info_mac.h
diff --git a/src/libapetag/info_mpc.c b/src/libapetag/info_mpc.c
index 18ee71b..18ee71b 100755..100644
--- a/src/libapetag/info_mpc.c
+++ b/src/libapetag/info_mpc.c
diff --git a/src/libapetag/info_mpc.h b/src/libapetag/info_mpc.h
index 330cbf0..330cbf0 100755..100644
--- a/src/libapetag/info_mpc.h
+++ b/src/libapetag/info_mpc.h
diff --git a/src/libapetag/is_tag.c b/src/libapetag/is_tag.c
index dc56023..dc56023 100755..100644
--- a/src/libapetag/is_tag.c
+++ b/src/libapetag/is_tag.c
diff --git a/src/libapetag/is_tag.h b/src/libapetag/is_tag.h
index bb04061..bb04061 100755..100644
--- a/src/libapetag/is_tag.h
+++ b/src/libapetag/is_tag.h
diff --git a/src/libmpg123/Makefile.am b/src/libmpg123/Makefile.am
index 697fa03..697fa03 100755..100644
--- a/src/libmpg123/Makefile.am
+++ b/src/libmpg123/Makefile.am
diff --git a/src/libmpg123/README b/src/libmpg123/README
index 1a66a66..1a66a66 100755..100644
--- a/src/libmpg123/README
+++ b/src/libmpg123/README
diff --git a/src/libmpg123/common.c b/src/libmpg123/common.c
index 80c299d..80c299d 100755..100644
--- a/src/libmpg123/common.c
+++ b/src/libmpg123/common.c
diff --git a/src/libmpg123/dxhead.c b/src/libmpg123/dxhead.c
index 21b5ceb..21b5ceb 100755..100644
--- a/src/libmpg123/dxhead.c
+++ b/src/libmpg123/dxhead.c
diff --git a/src/libmpg123/dxhead.h b/src/libmpg123/dxhead.h
index bcbc66a..bcbc66a 100755..100644
--- a/src/libmpg123/dxhead.h
+++ b/src/libmpg123/dxhead.h
diff --git a/src/libmpg123/getbits.c b/src/libmpg123/getbits.c
index a071b5e..a071b5e 100755..100644
--- a/src/libmpg123/getbits.c
+++ b/src/libmpg123/getbits.c
diff --git a/src/libmpg123/getbits.h b/src/libmpg123/getbits.h
index 1e5cf65..1e5cf65 100755..100644
--- a/src/libmpg123/getbits.h
+++ b/src/libmpg123/getbits.h
diff --git a/src/libmpg123/huffman.h b/src/libmpg123/huffman.h
index 83a230b..83a230b 100755..100644
--- a/src/libmpg123/huffman.h
+++ b/src/libmpg123/huffman.h
diff --git a/src/libmpg123/l2tables.h b/src/libmpg123/l2tables.h
index 51eb22f..51eb22f 100755..100644
--- a/src/libmpg123/l2tables.h
+++ b/src/libmpg123/l2tables.h
diff --git a/src/libmpg123/layer1.c b/src/libmpg123/layer1.c
index 057f08b..057f08b 100755..100644
--- a/src/libmpg123/layer1.c
+++ b/src/libmpg123/layer1.c
diff --git a/src/libmpg123/layer2.c b/src/libmpg123/layer2.c
index 07ce258..07ce258 100755..100644
--- a/src/libmpg123/layer2.c
+++ b/src/libmpg123/layer2.c
diff --git a/src/libmpg123/layer3.c b/src/libmpg123/layer3.c
index c7cb8cd..c7cb8cd 100755..100644
--- a/src/libmpg123/layer3.c
+++ b/src/libmpg123/layer3.c
diff --git a/src/libmpg123/mpg123.c b/src/libmpg123/mpg123.c
index dae9327..dae9327 100755..100644
--- a/src/libmpg123/mpg123.c
+++ b/src/libmpg123/mpg123.c
diff --git a/src/libmpg123/mpg123.h b/src/libmpg123/mpg123.h
index a3a3726..a3a3726 100755..100644
--- a/src/libmpg123/mpg123.h
+++ b/src/libmpg123/mpg123.h
diff --git a/src/log.c b/src/log.c
index cde953e..cde953e 100755..100644
--- a/src/log.c
+++ b/src/log.c
diff --git a/src/log.h b/src/log.h
index d7c9cbb..d7c9cbb 100755..100644
--- a/src/log.h
+++ b/src/log.h
diff --git a/src/misc.c b/src/misc.c
index 5803279..5803279 100755..100644
--- a/src/misc.c
+++ b/src/misc.c
diff --git a/src/misc.h b/src/misc.h
index 2b0c582..2b0c582 100755..100644
--- a/src/misc.h
+++ b/src/misc.h
diff --git a/src/monkeyaudio_header.c b/src/monkeyaudio_header.c
index e6cf0ab..e6cf0ab 100755..100644
--- a/src/monkeyaudio_header.c
+++ b/src/monkeyaudio_header.c
diff --git a/src/monkeyaudio_header.h b/src/monkeyaudio_header.h
index a717472..a717472 100755..100644
--- a/src/monkeyaudio_header.h
+++ b/src/monkeyaudio_header.h
diff --git a/src/mp4_header.c b/src/mp4_header.c
index 3b7ec4b..3b7ec4b 100755..100644
--- a/src/mp4_header.c
+++ b/src/mp4_header.c
diff --git a/src/mp4_header.h b/src/mp4_header.h
index 2e2f2a1..2e2f2a1 100755..100644
--- a/src/mp4_header.h
+++ b/src/mp4_header.h
diff --git a/src/mp4_tag.c b/src/mp4_tag.c
index 1336ee5..1336ee5 100755..100644
--- a/src/mp4_tag.c
+++ b/src/mp4_tag.c
diff --git a/src/mp4_tag.h b/src/mp4_tag.h
index b25d3a2..b25d3a2 100755..100644
--- a/src/mp4_tag.h
+++ b/src/mp4_tag.h
diff --git a/src/mpeg_header.c b/src/mpeg_header.c
index 82edd99..82edd99 100755..100644
--- a/src/mpeg_header.c
+++ b/src/mpeg_header.c
diff --git a/src/mpeg_header.h b/src/mpeg_header.h
index 7cb46cd..7cb46cd 100755..100644
--- a/src/mpeg_header.h
+++ b/src/mpeg_header.h
diff --git a/src/msgbox.c b/src/msgbox.c
index 82953f9..82953f9 100755..100644
--- a/src/msgbox.c
+++ b/src/msgbox.c
diff --git a/src/msgbox.h b/src/msgbox.h
index b3dfaf2..b3dfaf2 100755..100644
--- a/src/msgbox.h
+++ b/src/msgbox.h
diff --git a/src/musepack_header.c b/src/musepack_header.c
index 8bd4982..8bd4982 100755..100644
--- a/src/musepack_header.c
+++ b/src/musepack_header.c
diff --git a/src/musepack_header.h b/src/musepack_header.h
index 8d321ee..8d321ee 100755..100644
--- a/src/musepack_header.h
+++ b/src/musepack_header.h
diff --git a/src/ogg_header.c b/src/ogg_header.c
index 69634f7..69634f7 100755..100644
--- a/src/ogg_header.c
+++ b/src/ogg_header.c
diff --git a/src/ogg_header.h b/src/ogg_header.h
index 467b0b7..467b0b7 100755..100644
--- a/src/ogg_header.h
+++ b/src/ogg_header.h
diff --git a/src/ogg_tag.c b/src/ogg_tag.c
index 1fa12a2..1fa12a2 100755..100644
--- a/src/ogg_tag.c
+++ b/src/ogg_tag.c
diff --git a/src/ogg_tag.h b/src/ogg_tag.h
index df4bbb3..df4bbb3 100755..100644
--- a/src/ogg_tag.h
+++ b/src/ogg_tag.h
diff --git a/src/picture.c b/src/picture.c
index dea79e6..dea79e6 100755..100644
--- a/src/picture.c
+++ b/src/picture.c
diff --git a/src/picture.h b/src/picture.h
index cc8ee2e..cc8ee2e 100755..100644
--- a/src/picture.h
+++ b/src/picture.h
diff --git a/src/prefs.h b/src/prefs.h
index 5c1e122..5c1e122 100755..100644
--- a/src/prefs.h
+++ b/src/prefs.h
diff --git a/src/scan.h b/src/scan.h
index de151a2..de151a2 100755..100644
--- a/src/scan.h
+++ b/src/scan.h
diff --git a/src/setting.c b/src/setting.c
index 6e67d84..6e67d84 100755..100644
--- a/src/setting.c
+++ b/src/setting.c
diff --git a/src/vcedit.c b/src/vcedit.c
index 3e583bd..3e583bd 100755..100644
--- a/src/vcedit.c
+++ b/src/vcedit.c
diff --git a/src/vcedit.h b/src/vcedit.h
index 5bc39dc..5bc39dc 100755..100644
--- a/src/vcedit.h
+++ b/src/vcedit.h
diff --git a/src/wavpack_header.c b/src/wavpack_header.c
index c7067b8..c7067b8 100755..100644
--- a/src/wavpack_header.c
+++ b/src/wavpack_header.c
diff --git a/src/wavpack_header.h b/src/wavpack_header.h
index c61e006..c61e006 100755..100644
--- a/src/wavpack_header.h
+++ b/src/wavpack_header.h
diff --git a/src/wavpack_tag.c b/src/wavpack_tag.c
index e33f78e..e33f78e 100755..100644
--- a/src/wavpack_tag.c
+++ b/src/wavpack_tag.c
diff --git a/src/wavpack_tag.h b/src/wavpack_tag.h
index 0ace45b..0ace45b 100755..100644
--- a/src/wavpack_tag.h
+++ b/src/wavpack_tag.h
diff --git a/src/win32/easytag.rc b/src/win32/easytag.rc
index cd8fd58..cd8fd58 100755..100644
--- a/src/win32/easytag.rc
+++ b/src/win32/easytag.rc
diff --git a/src/win32/gtkwin32dep.c b/src/win32/gtkwin32dep.c
index af5d73b..af5d73b 100755..100644
--- a/src/win32/gtkwin32dep.c
+++ b/src/win32/gtkwin32dep.c
diff --git a/src/win32/gtkwin32dep.h b/src/win32/gtkwin32dep.h
index 71d49a2..71d49a2 100755..100644
--- a/src/win32/gtkwin32dep.h
+++ b/src/win32/gtkwin32dep.h
diff --git a/src/win32/nsis/easytag-header.bmp b/src/win32/nsis/easytag-header.bmp
index 85aaeb1..85aaeb1 100755..100644
--- a/src/win32/nsis/easytag-header.bmp
+++ b/src/win32/nsis/easytag-header.bmp
diff --git a/src/win32/nsis/easytag-install.bmp b/src/win32/nsis/easytag-install.bmp
index 5bfd99b..5bfd99b 100755..100644
--- a/src/win32/nsis/easytag-install.bmp
+++ b/src/win32/nsis/easytag-install.bmp
diff --git a/src/win32/nsis/easytag-install.ico b/src/win32/nsis/easytag-install.ico
index 0e8673e..0e8673e 100755..100644
--- a/src/win32/nsis/easytag-install.ico
+++ b/src/win32/nsis/easytag-install.ico
diff --git a/src/win32/nsis/easytag-uninstall.bmp b/src/win32/nsis/easytag-uninstall.bmp
index 5cf16db..5cf16db 100755..100644
--- a/src/win32/nsis/easytag-uninstall.bmp
+++ b/src/win32/nsis/easytag-uninstall.bmp
diff --git a/src/win32/resource.h b/src/win32/resource.h
index 4cd30ad..4cd30ad 100755..100644
--- a/src/win32/resource.h
+++ b/src/win32/resource.h
diff --git a/src/win32/win32dep.c b/src/win32/win32dep.c
index 35e32d6..35e32d6 100755..100644
--- a/src/win32/win32dep.c
+++ b/src/win32/win32dep.c
diff --git a/src/win32/win32dep.h b/src/win32/win32dep.h
index 5a12ba3..5a12ba3 100755..100644
--- a/src/win32/win32dep.h
+++ b/src/win32/win32dep.h
diff --git a/src/win32/win_easytag.c b/src/win32/win_easytag.c
index 8aaa825..8aaa825 100755..100644
--- a/src/win32/win_easytag.c
+++ b/src/win32/win_easytag.c