FSF address change.

[vlc] / modules / gui / macosx / open.m

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 8403fab5017b4208d8e5a7039b940a00586ceb8b..0e27c657df7cf5eb8f9c3e08cfc0d3ee8a079c1c 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.m: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2005 VideoLAN
+ * Copyright (C) 2002-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -81,7 +81,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     p_list = [NSMutableArray arrayWithCapacity: 1];
     
     next_media = IOIteratorNext( media_iterator );
-    if( next_media != NULL )
+    if( next_media != nil )
     {
         char psz_buf[0x32];
         size_t dev_path_length;
@@ -114,7 +114,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
             
             IOObjectRelease( next_media );
         
-        } while( ( next_media = IOIteratorNext( media_iterator ) ) != NULL );
+        } while( ( next_media = IOIteratorNext( media_iterator ) ) != nil );
     }
     
     IOObjectRelease( media_iterator );
@@ -323,7 +323,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
             intf_thread_t * p_intf = VLCIntf;
             module_config_t * p_item;
 
-            [o_options addObject: [NSString stringWithFormat: @"sub-file=%s", [[o_file_sub_path stringValue] fileSystemRepresentation]]];
+            [o_options addObject: [NSString stringWithFormat: @"sub-file=%@", [o_file_sub_path stringValue]]];
             if( [o_file_sub_override state] == NSOnState )
             {
                 [o_options addObject: [NSString stringWithFormat: @"sub-delay=%i", (int)( [o_file_sub_delay intValue] * 10 )]];