61 files changed, 15 insertions, 9 deletions

diff --git a/doc/id3/id3v2_blocks.gif b/doc/id3/id3v2_blocks.gif
index 153027e..153027e 100755..100644
--- a/doc/id3/id3v2_blocks.gif
+++ b/doc/id3/id3v2_blocks.gif
diff --git a/doc/users_guide_french/images/bouton_arbo.png b/doc/users_guide_french/images/bouton_arbo.png
index 0d0344d..0d0344d 100755..100644
--- a/doc/users_guide_french/images/bouton_arbo.png
+++ b/doc/users_guide_french/images/bouton_arbo.png
diff --git a/doc/users_guide_french/images/bouton_img1.png b/doc/users_guide_french/images/bouton_img1.png
index 310d85f..310d85f 100755..100644
--- a/doc/users_guide_french/images/bouton_img1.png
+++ b/doc/users_guide_french/images/bouton_img1.png
diff --git a/doc/users_guide_french/images/bouton_img2.png b/doc/users_guide_french/images/bouton_img2.png
index c32978b..c32978b 100755..100644
--- a/doc/users_guide_french/images/bouton_img2.png
+++ b/doc/users_guide_french/images/bouton_img2.png
diff --git a/doc/users_guide_french/images/bouton_img3.png b/doc/users_guide_french/images/bouton_img3.png
index 611c362..611c362 100755..100644
--- a/doc/users_guide_french/images/bouton_img3.png
+++ b/doc/users_guide_french/images/bouton_img3.png
diff --git a/doc/users_guide_french/images/bouton_scan1.png b/doc/users_guide_french/images/bouton_scan1.png
index 817806e..817806e 100755..100644
--- a/doc/users_guide_french/images/bouton_scan1.png
+++ b/doc/users_guide_french/images/bouton_scan1.png
diff --git a/doc/users_guide_french/images/bouton_scan2.png b/doc/users_guide_french/images/bouton_scan2.png
index 6d0b22c..6d0b22c 100755..100644
--- a/doc/users_guide_french/images/bouton_scan2.png
+++ b/doc/users_guide_french/images/bouton_scan2.png
diff --git a/doc/users_guide_french/images/bouton_scan3.png b/doc/users_guide_french/images/bouton_scan3.png
index 12c1c13..12c1c13 100755..100644
--- a/doc/users_guide_french/images/bouton_scan3.png
+++ b/doc/users_guide_french/images/bouton_scan3.png
diff --git a/doc/users_guide_french/images/bouton_scan4.png b/doc/users_guide_french/images/bouton_scan4.png
index 2d78847..2d78847 100755..100644
--- a/doc/users_guide_french/images/bouton_scan4.png
+++ b/doc/users_guide_french/images/bouton_scan4.png
diff --git a/doc/users_guide_french/images/bouton_scan5.png b/doc/users_guide_french/images/bouton_scan5.png
index 82bf213..82bf213 100755..100644
--- a/doc/users_guide_french/images/bouton_scan5.png
+++ b/doc/users_guide_french/images/bouton_scan5.png
diff --git a/doc/users_guide_french/images/bouton_scan6.png b/doc/users_guide_french/images/bouton_scan6.png
index 5ac656c..5ac656c 100755..100644
--- a/doc/users_guide_french/images/bouton_scan6.png
+++ b/doc/users_guide_french/images/bouton_scan6.png
diff --git a/doc/users_guide_french/images/bouton_scan7.png b/doc/users_guide_french/images/bouton_scan7.png
index fe49ce3..fe49ce3 100755..100644
--- a/doc/users_guide_french/images/bouton_scan7.png
+++ b/doc/users_guide_french/images/bouton_scan7.png
diff --git a/doc/users_guide_french/images/fen_boutons.png b/doc/users_guide_french/images/fen_boutons.png
index d9f3782..d9f3782 100755..100644
--- a/doc/users_guide_french/images/fen_boutons.png
+++ b/doc/users_guide_french/images/fen_boutons.png
diff --git a/doc/users_guide_french/images/fen_cddb1.png b/doc/users_guide_french/images/fen_cddb1.png
index a463006..a463006 100755..100644
--- a/doc/users_guide_french/images/fen_cddb1.png
+++ b/doc/users_guide_french/images/fen_cddb1.png
diff --git a/doc/users_guide_french/images/fen_cddb2.png b/doc/users_guide_french/images/fen_cddb2.png
index 6ff4dda..6ff4dda 100755..100644
--- a/doc/users_guide_french/images/fen_cddb2.png
+++ b/doc/users_guide_french/images/fen_cddb2.png
diff --git a/doc/users_guide_french/images/fen_fic_txt.png b/doc/users_guide_french/images/fen_fic_txt.png
index d9aec03..d9aec03 100755..100644
--- a/doc/users_guide_french/images/fen_fic_txt.png
+++ b/doc/users_guide_french/images/fen_fic_txt.png
diff --git a/doc/users_guide_french/images/fen_fich.png b/doc/users_guide_french/images/fen_fich.png
index 8e0379a..8e0379a 100755..100644
--- a/doc/users_guide_french/images/fen_fich.png
+++ b/doc/users_guide_french/images/fen_fich.png
diff --git a/doc/users_guide_french/images/fen_lect1.png b/doc/users_guide_french/images/fen_lect1.png
index 9f0f284..9f0f284 100755..100644
--- a/doc/users_guide_french/images/fen_lect1.png
+++ b/doc/users_guide_french/images/fen_lect1.png
diff --git a/doc/users_guide_french/images/fen_lect2.png b/doc/users_guide_french/images/fen_lect2.png
index 7ed442a..7ed442a 100755..100644
--- a/doc/users_guide_french/images/fen_lect2.png
+++ b/doc/users_guide_french/images/fen_lect2.png
diff --git a/doc/users_guide_french/images/fen_playlist.png b/doc/users_guide_french/images/fen_playlist.png
index dd538e2..dd538e2 100755..100644
--- a/doc/users_guide_french/images/fen_playlist.png
+++ b/doc/users_guide_french/images/fen_playlist.png
diff --git a/doc/users_guide_french/images/fen_rech1.png b/doc/users_guide_french/images/fen_rech1.png
index 7404e93..7404e93 100755..100644
--- a/doc/users_guide_french/images/fen_rech1.png
+++ b/doc/users_guide_french/images/fen_rech1.png
diff --git a/doc/users_guide_french/images/fen_scan1.png b/doc/users_guide_french/images/fen_scan1.png
index 132e83c..132e83c 100755..100644
--- a/doc/users_guide_french/images/fen_scan1.png
+++ b/doc/users_guide_french/images/fen_scan1.png
diff --git a/doc/users_guide_french/images/fen_scan2.png b/doc/users_guide_french/images/fen_scan2.png
index 705e518..705e518 100755..100644
--- a/doc/users_guide_french/images/fen_scan2.png
+++ b/doc/users_guide_french/images/fen_scan2.png
diff --git a/doc/users_guide_french/images/fen_scan3.png b/doc/users_guide_french/images/fen_scan3.png
index d34cef5..d34cef5 100755..100644
--- a/doc/users_guide_french/images/fen_scan3.png
+++ b/doc/users_guide_french/images/fen_scan3.png
diff --git a/doc/users_guide_french/images/fen_scan4.png b/doc/users_guide_french/images/fen_scan4.png
index 5eaceac..5eaceac 100755..100644
--- a/doc/users_guide_french/images/fen_scan4.png
+++ b/doc/users_guide_french/images/fen_scan4.png
diff --git a/doc/users_guide_french/images/fen_sel1.png b/doc/users_guide_french/images/fen_sel1.png
index ec31e39..ec31e39 100755..100644
--- a/doc/users_guide_french/images/fen_sel1.png
+++ b/doc/users_guide_french/images/fen_sel1.png
diff --git a/doc/users_guide_french/images/fen_sel2.png b/doc/users_guide_french/images/fen_sel2.png
index 7667254..7667254 100755..100644
--- a/doc/users_guide_french/images/fen_sel2.png
+++ b/doc/users_guide_french/images/fen_sel2.png
diff --git a/doc/users_guide_french/images/fen_sel3.png b/doc/users_guide_french/images/fen_sel3.png
index bf61edd..bf61edd 100755..100644
--- a/doc/users_guide_french/images/fen_sel3.png
+++ b/doc/users_guide_french/images/fen_sel3.png
diff --git a/doc/users_guide_french/images/fen_tag_bout1.png b/doc/users_guide_french/images/fen_tag_bout1.png
index d028421..d028421 100755..100644
--- a/doc/users_guide_french/images/fen_tag_bout1.png
+++ b/doc/users_guide_french/images/fen_tag_bout1.png
diff --git a/doc/users_guide_french/images/fen_tag_bout2.png b/doc/users_guide_french/images/fen_tag_bout2.png
index bf50fea..bf50fea 100755..100644
--- a/doc/users_guide_french/images/fen_tag_bout2.png
+++ b/doc/users_guide_french/images/fen_tag_bout2.png
diff --git a/doc/users_guide_french/images/fen_tag_gen.png b/doc/users_guide_french/images/fen_tag_gen.png
index b3a9b96..b3a9b96 100755..100644
--- a/doc/users_guide_french/images/fen_tag_gen.png
+++ b/doc/users_guide_french/images/fen_tag_gen.png
diff --git a/doc/users_guide_french/images/fen_tag_img.png b/doc/users_guide_french/images/fen_tag_img.png
index ddeb5b2..ddeb5b2 100755..100644
--- a/doc/users_guide_french/images/fen_tag_img.png
+++ b/doc/users_guide_french/images/fen_tag_img.png
diff --git a/doc/users_guide_french/images/interface.png b/doc/users_guide_french/images/interface.png
index 6375f19..6375f19 100755..100644
--- a/doc/users_guide_french/images/interface.png
+++ b/doc/users_guide_french/images/interface.png
diff --git a/doc/users_guide_french/images/menu_context1.png b/doc/users_guide_french/images/menu_context1.png
index 30c0ac8..30c0ac8 100755..100644
--- a/doc/users_guide_french/images/menu_context1.png
+++ b/doc/users_guide_french/images/menu_context1.png
diff --git a/doc/users_guide_french/images/menu_context2.png b/doc/users_guide_french/images/menu_context2.png
index 959e229..959e229 100755..100644
--- a/doc/users_guide_french/images/menu_context2.png
+++ b/doc/users_guide_french/images/menu_context2.png
diff --git a/doc/users_guide_french/images/menu_context3.png b/doc/users_guide_french/images/menu_context3.png
index 6c4218c..6c4218c 100755..100644
--- a/doc/users_guide_french/images/menu_context3.png
+++ b/doc/users_guide_french/images/menu_context3.png
diff --git a/doc/users_guide_french/images/menu_div.png b/doc/users_guide_french/images/menu_div.png
index c7c1b64..c7c1b64 100755..100644
--- a/doc/users_guide_french/images/menu_div.png
+++ b/doc/users_guide_french/images/menu_div.png
diff --git a/doc/users_guide_french/images/menu_fic.png b/doc/users_guide_french/images/menu_fic.png
index 8dd1147..8dd1147 100755..100644
--- a/doc/users_guide_french/images/menu_fic.png
+++ b/doc/users_guide_french/images/menu_fic.png
diff --git a/doc/users_guide_french/images/menu_pref.png b/doc/users_guide_french/images/menu_pref.png
index 7e8e722..7e8e722 100755..100644
--- a/doc/users_guide_french/images/menu_pref.png
+++ b/doc/users_guide_french/images/menu_pref.png
diff --git a/doc/users_guide_french/images/menu_recherche.png b/doc/users_guide_french/images/menu_recherche.png
index ee368c7..ee368c7 100755..100644
--- a/doc/users_guide_french/images/menu_recherche.png
+++ b/doc/users_guide_french/images/menu_recherche.png
diff --git a/doc/users_guide_french/images/menu_recherche1.png b/doc/users_guide_french/images/menu_recherche1.png
index cddbe7c..cddbe7c 100755..100644
--- a/doc/users_guide_french/images/menu_recherche1.png
+++ b/doc/users_guide_french/images/menu_recherche1.png
diff --git a/doc/users_guide_french/images/menu_recherche2.png b/doc/users_guide_french/images/menu_recherche2.png
index da8cebe..da8cebe 100755..100644
--- a/doc/users_guide_french/images/menu_recherche2.png
+++ b/doc/users_guide_french/images/menu_recherche2.png
diff --git a/doc/users_guide_french/images/menu_scan.png b/doc/users_guide_french/images/menu_scan.png
index a88d1cc..a88d1cc 100755..100644
--- a/doc/users_guide_french/images/menu_scan.png
+++ b/doc/users_guide_french/images/menu_scan.png
diff --git a/doc/users_guide_french/images/menu_sel.png b/doc/users_guide_french/images/menu_sel.png
index c1ea0e3..c1ea0e3 100755..100644
--- a/doc/users_guide_french/images/menu_sel.png
+++ b/doc/users_guide_french/images/menu_sel.png
diff --git a/doc/users_guide_french/images/sousmenu_fic1.png b/doc/users_guide_french/images/sousmenu_fic1.png
index b8cdb97..b8cdb97 100755..100644
--- a/doc/users_guide_french/images/sousmenu_fic1.png
+++ b/doc/users_guide_french/images/sousmenu_fic1.png
diff --git a/doc/users_guide_french/images/sousmenu_fic2.png b/doc/users_guide_french/images/sousmenu_fic2.png
index f527825..f527825 100755..100644
--- a/doc/users_guide_french/images/sousmenu_fic2.png
+++ b/doc/users_guide_french/images/sousmenu_fic2.png
diff --git a/doc/users_guide_german/images/EasyTAG.png b/doc/users_guide_german/images/EasyTAG.png
index fd132d3..fd132d3 100755..100644
--- a/doc/users_guide_german/images/EasyTAG.png
+++ b/doc/users_guide_german/images/EasyTAG.png
diff --git a/doc/users_guide_german/images/eigensch.png b/doc/users_guide_german/images/eigensch.png
index 71d7edc..71d7edc 100755..100644
--- a/doc/users_guide_german/images/eigensch.png
+++ b/doc/users_guide_german/images/eigensch.png
diff --git a/doc/users_guide_german/images/filelist.png b/doc/users_guide_german/images/filelist.png
index 237198e..237198e 100755..100644
--- a/doc/users_guide_german/images/filelist.png
+++ b/doc/users_guide_german/images/filelist.png
diff --git a/doc/users_guide_german/images/playlist.png b/doc/users_guide_german/images/playlist.png
index 18c491e..18c491e 100755..100644
--- a/doc/users_guide_german/images/playlist.png
+++ b/doc/users_guide_german/images/playlist.png
diff --git a/doc/users_guide_german/images/search.png b/doc/users_guide_german/images/search.png
index 8910228..8910228 100755..100644
--- a/doc/users_guide_german/images/search.png
+++ b/doc/users_guide_german/images/search.png
diff --git a/doc/users_guide_german/images/t_easytag.jpg b/doc/users_guide_german/images/t_easytag.jpg
index 50c00c1..50c00c1 100755..100644
--- a/doc/users_guide_german/images/t_easytag.jpg
+++ b/doc/users_guide_german/images/t_easytag.jpg
diff --git a/doc/users_guide_german/images/treeview.png b/doc/users_guide_german/images/treeview.png
index 3407b8c..3407b8c 100755..100644
--- a/doc/users_guide_german/images/treeview.png
+++ b/doc/users_guide_german/images/treeview.png
diff --git a/doc/vorbis/white-ogg.png b/doc/vorbis/white-ogg.png
index 45dc0ac..45dc0ac 100755..100644
--- a/doc/vorbis/white-ogg.png
+++ b/doc/vorbis/white-ogg.png
diff --git a/pixmaps/EasyTAG.ico b/pixmaps/EasyTAG.ico
index 0cfd775..0cfd775 100755..100644
--- a/pixmaps/EasyTAG.ico
+++ b/pixmaps/EasyTAG.ico
diff --git a/pixmaps/EasyTAG2.ico b/pixmaps/EasyTAG2.ico
index 437df00..437df00 100755..100644
--- a/pixmaps/EasyTAG2.ico
+++ b/pixmaps/EasyTAG2.ico
diff --git a/src/cddb.c b/src/cddb.c
index a150fce..d60220e 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/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