* Bumped up revision number to 0.5.0-test3,

* Rearranged fields in the OS X interface to accomodate for translations,
* modules/access/dvd/ifo.c: fixed a crash with bad streams,
* Auto-updated po files,
* Manually updated fr.po.

configure.ac.in

 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.5.0-test2)
+AC_INIT(vlc,0.5.0-test3)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Natalya"
@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.5.0-test2)
+AM_INIT_AUTOMAKE(vlc,0.5.0-test3)
 AM_CONFIG_HEADER(config.h)
 
 dnl

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -7,13 +7,13 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>16 821 374 44 0 0 1280 1002 </string>
+		<string>14 602 374 44 0 0 1152 746 </string>
 		<key>303</key>
 		<string>60 509 104 66 0 0 1280 1002 </string>
 		<key>909</key>
-		<string>425 600 430 172 0 0 1280 1002 </string>
+		<string>343 411 430 172 0 0 1152 746 </string>
 		<key>915</key>
-		<string>439 657 93 96 0 0 1280 1002 </string>
+		<string>392 471 93 96 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>291.0</string>
@@ -23,9 +23,10 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>21</integer>
 		<integer>909</integer>
+		<integer>21</integer>
 		<integer>915</integer>
+		<integer>636</integer>
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -213,7 +213,7 @@
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleVersion</key>
-	<string>0.5.0-test2</string>
+	<string>0.5.0-test3</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

modules/access/dvd/ifo.c

@@ -2,7 +2,7 @@
  * ifo.c: Functions for ifo parsing
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ifo.c,v 1.3 2002/11/08 10:26:52 gbazin Exp $
+ * $Id: ifo.c,v 1.4 2003/01/16 23:00:47 massiot Exp $
  *
  * Authors: Stphane Borel <stef@via.ecp.fr>
  *          German Tischler <tanis@gaspode.franken.de>
@@ -93,6 +93,8 @@ int IfoCreate( thread_dvd_data_t * p_dvd )
     {
         return -1;
     }
+    /* memset to 0 to avoid crashing on deallocation later */
+    memset( p_dvd->p_ifo, 0, sizeof(ifo_t) );
 
     /* if we are here the dvd device has already been opened */
     p_dvd->p_ifo->dvdhandle = p_dvd->dvdhandle;
@@ -841,11 +843,14 @@ void IfoDestroy( ifo_t * p_ifo )
         {
             for( j = 0 ; j < 8 ; j++ )
             {
+                if ( p_ifo->vmg.parental_inf.p_parental_mask[i].ppi_mask[j] != NULL )
                     free( p_ifo->vmg.parental_inf.p_parental_mask[i].ppi_mask[j] );
             }
         }
 
+        if ( p_ifo->vmg.parental_inf.p_parental_mask != NULL )
             free( p_ifo->vmg.parental_inf.p_parental_mask );
+        if ( p_ifo->vmg.parental_inf.p_parental_desc != NULL )
             free( p_ifo->vmg.parental_inf.p_parental_desc );
     }
 

modules/gui/macosx/prefs.m

@@ -2,7 +2,7 @@
  * prefs.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: prefs.m,v 1.6 2003/01/05 16:23:57 massiot Exp $
+ * $Id: prefs.m,v 1.7 2003/01/16 23:00:47 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -186,7 +186,7 @@
 
     /* We found it, now we can start building its configuration interface */
 
-    s_panel_rc = NSMakeRect( 0, 0, 450, 450 );
+    s_panel_rc = NSMakeRect( 0, 0, 550, 450 );
     o_panel = [[NSPanel alloc] initWithContentRect: s_panel_rc
                                styleMask: NSTitledWindowMask
                                backing: NSBackingStoreBuffered

po/sv.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-01-16 15:01+0100\n"
+"POT-Creation-Date: 2003-01-16 23:15+0100\n"
 "PO-Revision-Date: 2002-07-23 23:00+0200\n"
 "Last-Translator: Joel Arvidsson <dogai@privat.utfors.se>\n"
 "Language-Team: \n"