[easytag] Remove some duplicates in conditional expressions

[David King <davidk src gnome org>]

commit e0a5170f4a6a313a204d620411c0d6e38ac83ffe
Author: David King <amigadave amigadave com>
Date:   Tue Feb 5 17:22:35 2013 +0000

    Remove some duplicates in conditional expressions

 src/cddb.c  |   12 ++++++------
 src/prefs.c |    2 --
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/cddb.c b/src/cddb.c
index 002050d..6b7af53 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -3918,9 +3918,9 @@ Cddb_Set_Track_Infos_To_File_List (void)
             /*
              * Tag fields
              */
-            if (cddbsettoallfields || cddbsettotitle      || cddbsettotitle
-            ||  cddbsettoartist    || cddbsettoalbum      || cddbsettoyear
-            ||  cddbsettotrack     || cddbsettotracktotal || cddbsettogenre)
+            if (cddbsettoallfields || cddbsettotitle || cddbsettoartist
+                || cddbsettoalbum || cddbsettoyear || cddbsettotrack
+                || cddbsettotracktotal || cddbsettogenre)
             {
                 // Allocation of a new FileTag
                 FileTag = ET_File_Tag_Item_New();
@@ -4004,9 +4004,9 @@ Cddb_Set_Track_Infos_To_File_List (void)
             /*
              * Tag fields
              */
-            if (cddbsettoallfields || cddbsettotitle      || cddbsettotitle
-            ||  cddbsettoartist    || cddbsettoalbum      || cddbsettoyear
-            ||  cddbsettotrack     || cddbsettotracktotal || cddbsettogenre)
+            if (cddbsettoallfields || cddbsettotitle || cddbsettoartist
+                || cddbsettoalbum || cddbsettoyear || cddbsettotrack
+                || cddbsettotracktotal || cddbsettogenre)
             {
                 // Allocation of a new FileTag
                 FileTag = ET_File_Tag_Item_New();
diff --git a/src/prefs.c b/src/prefs.c
index 1fa11a2..8f12323 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -1544,8 +1544,6 @@ Change_Id3_Settings_Toggled (void)
 #endif
     ||   !FileWritingId3v1WriteTag
     ||   !LabelId3v2Charset
-    ||   !FileWritingId3v2UseUnicodeCharacterSet
-    ||   !FileWritingId3v2UseNoUnicodeCharacterSet
     ||   !FileWritingId3v2UnicodeCharacterSetCombo
     ||   !FileWritingId3v2NoUnicodeCharacterSetCombo
     ||   !LabelAdditionalId3v2IconvOptions