Qt4 - fix compilation on QT4.2

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index cdf42aaaed13cfded76dfdc90444bab78c0ec072..1e59c0a4bffea32d8e9f51eb90311bab403131d3 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -39,18 +39,76 @@
 
 #if defined (WIN32) || defined (__APPLE__)
 static const char *ppsz_language[] =
-{ "auto", "ar", "en", "en_GB", "ca", "cs", "da", "de", "es", "fa"  "fr", "gl",
-    "he", "hu", "it", "ja", "ka", "ko", "ms", "nl", "oc", "pl", "pt_BR", "ro",
-    "ru", "sk", "sl", "sv", "tr", "zh_CN", "zh_TW" };
+{
+    "auto",
+    "en",
+    "ar",
+    "pt_BR",
+    "en_GB",
+    "ca",
+    "zh_TW",
+    "cs",
+    "da",
+    "nl",
+    "fi",
+    "fr",
+    "gl",
+    "ka",
+    "de",
+    "he",
+    "hu",
+    "it",
+    "ja",
+    "ko",
+    "ms",
+    "oc",
+    "fa",
+    "pl",
+    "ro",
+    "ru",
+    "zh_CN",
+    "sk",
+    "sl",
+    "es",
+    "sv",
+    "tr"
+};
 
 static const char *ppsz_language_text[] =
-{ N_("Auto"), N_("Arabic"), N_("American English"), N_("British English"),
-N_("Catalan"), N_("Czech"), N_("Danish"), N_("German"), N_("Spanish"),
-N_("Persian"), N_("French"), N_("Galician"), N_("Hebrew"), N_("Hungarian"),
-N_("Italian"), N_("Japanese"),N_("Georgian"), N_("Korean"), N_("Malay"),
-N_("Dutch"), N_("Occitan"), N_("Polish"), N_("Brazilian Portuguese"),
-N_("Romanian"), N_("Russian"), N_("Slovak"), N_("Slovenian"), N_("Swedish"),
-N_("Turkish"), N_("Simplified Chinese"), N_("Chinese Traditional") };
+{
+    N_("Auto"),
+    N_("American English"),
+    N_("Arabic"),
+    N_("Brazilian Portuguese"),
+    N_("British English"),
+    N_("Catalan"),
+    N_("Chinese Traditional"),
+    N_("Czech"),
+    N_("Danish"),
+    N_("Dutch"),
+    N_("Finnish"),
+    N_("French"),
+    N_("Galician"),
+    N_("Georgian"),
+    N_("German"),
+    N_("Hebrew"),
+    N_("Hungarian"),
+    N_("Italian"),
+    N_("Japanese"),
+    N_("Korean"),
+    N_("Malay"),
+    N_("Occitan"),
+    N_("Persian"),
+    N_("Polish"),
+    N_("Romanian"),
+    N_("Russian"),
+    N_("Simplified Chinese"),
+    N_("Slovak"),
+    N_("Slovenian"),
+    N_("Spanish"),
+    N_("Swedish"),
+    N_("Turkish")
+};
 #endif
 
 static const char *ppsz_snap_formats[] =
@@ -1721,6 +1779,7 @@ vlc_module_begin();
               ONEINSTANCE_DBUS_LONGTEXT, VLC_TRUE );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
+        change_unsaveable();
 #endif
 
 #if defined(WIN32)
@@ -1735,6 +1794,7 @@ vlc_module_begin();
               ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, VLC_TRUE );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
+        change_unsaveable();
     add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT,
               HPRIORITY_LONGTEXT, VLC_FALSE );
         change_need_restart();
@@ -1809,7 +1869,7 @@ vlc_module_begin();
         change_need_restart();
 #endif
 
-    add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
+    add_bool( "color", VLC_TRUE, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
     add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
                     VLC_FALSE );
         change_need_restart();