Merge branch 1.0-bugfix

diff --git a/NEWS b/NEWS
index 52671ec67dff8efcfbffe2a707a44bd8558e2a37..382489dead1b6241bb54d139651e6011a2dfe616 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Changes between 1.0.0-rc1 and 1.1.0-git:
+----------------------------------------
+
+
 Changes between 0.9.9a and 1.0.0-rc1:
 ------------------------------------
 

diff --git a/configure.ac b/configure.ac
index be6e24cdd612620160f5e822355f4e47d8e3fb9f..17c1f638859c1c6d32c54d26f7128fd1bd9d94be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team])
 
-AC_INIT(vlc, 1.0.0-rc1)
+AC_INIT(vlc, 1.1.0-git)
 VERSION_MAJOR="1"
-VERSION_MINOR="0"
+VERSION_MINOR="1"
 VERSION_REVISION="0"
-VERSION_EXTRA="-rc1"
+VERSION_EXTRA="-git"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 

diff --git a/modules/gui/wince/preferences.cpp b/modules/gui/wince/preferences.cpp
index 554a37ac5c1814b738fb6fdffba3afd6ee2be0ed..012dab91d425bdfa31f6cb59c79c471c917e780c 100644 (file)
--- a/modules/gui/wince/preferences.cpp
+++ b/modules/gui/wince/preferences.cpp
@@ -403,7 +403,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( intf_thread_t *_p_intf,
                     psz_help = config_CategoryHelpGet( p_item->value.i );
                     if( psz_help )
                     {
-                        config_data->psz_help = wraptext( strdup( psz_help ), 72 );
+                        config_data->psz_help = strdup( psz_help );
                     }
                     else
                     {
@@ -447,7 +447,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( intf_thread_t *_p_intf,
                         const char *psz_help = config_CategoryHelpGet( p_item->value.i );
                         if( psz_help )
                         {
-                            config_data->psz_help = wraptext( strdup( psz_help ), 72 );
+                            config_data->psz_help = strdup( psz_help );
                         }
                         else
                         {
@@ -462,7 +462,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( intf_thread_t *_p_intf,
                     psz_help = config_CategoryHelpGet( p_item->value.i );
                     if( psz_help )
                     {
-                        config_data->psz_help = wraptext( strdup( psz_help ), 72 );
+                        config_data->psz_help = strdup( psz_help );
                     }
                     else
                     {

diff --git a/src/config/file.c b/src/config/file.c
index 0b2ba422c36e911c1dc1801d96b376d5b2a617f2..6c411f23ed9308c07c889b69aac826845a45c6b9 100644 (file)
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -512,7 +512,13 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
         goto error;
     }
 
-    if (asprintf (&temporary, "%s.%u", permanent, getpid ()) == -1)
+    if (asprintf (&temporary, "%s.%u", permanent,
+#ifdef UNDER_CE
+                  GetCurrentProcessId ()
+#else
+                  getpid ()
+#endif
+                 ) == -1)
     {
         temporary = NULL;
         module_list_free (list);

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 2c190e0b6509cab8806a9a4899b54f13584e760b..89d1a99a6d51f0a798c25fc33b2133097c058f5e 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -508,7 +508,12 @@ void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
 
     char psz_tmpname[sizeof (psz_filename) + 12];
     snprintf (psz_tmpname, sizeof (psz_tmpname), "%s.%"PRIu32, psz_filename,
-              (uint32_t)getpid ());
+#ifdef UNDER_CE
+              (uint32_t)GetCurrentProcessId ()
+#else
+              (uint32_t)getpid ()
+#endif
+             );
     file = utf8_fopen( psz_tmpname, "wb" );
     if (file == NULL)
         goto error;