[vlc-devel] commit: Removed the 'fetch-meta' setting as it isn't present anymore ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Jun 16 09:55:43 2008 +0200| [af28383a4e362803402e2d3f367e8c8f1a5bce10]

Removed the 'fetch-meta' setting as it isn't present anymore

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=af28383a4e362803402e2d3f367e8c8f1a5bce10
---

 .../English.lproj/Preferences.nib/classes.nib      |    1 -
 .../English.lproj/Preferences.nib/info.nib         |   17 ++++++++---------
 .../English.lproj/Preferences.nib/keyedobjects.nib |  Bin 95935 -> 95380 bytes
 modules/gui/macosx/simple_prefs.h                  |    1 -
 modules/gui/macosx/simple_prefs.m                  |    5 +----
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
index d45816c..6d6e7e5 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
@@ -118,7 +118,6 @@
                 "o_intf_fspanel_ckb" = id;
                 "o_intf_lang_pop" = id;
                 "o_intf_lang_txt" = id;
-                "o_intf_meta_ckb" = id;
                 "o_intf_network_box" = id;
                 "o_intf_view" = id;
                 "o_osd_encoding_pop" = id;
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
index 312011b..bc7626f 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
@@ -7,17 +7,17 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>2311</key>
-		<string>345 402 590 264 0 0 1280 778 </string>
+		<string>345 435 590 230 0 0 1280 778 </string>
 		<key>2330</key>
 		<string>345 223 590 502 0 0 1280 778 </string>
 		<key>2440</key>
-		<string>345 308 590 389 0 0 1280 778 </string>
+		<string>345 307 590 389 0 0 1280 778 </string>
 		<key>2523</key>
-		<string>345 320 590 373 0 0 1280 778 </string>
+		<string>345 319 590 373 0 0 1280 778 </string>
 		<key>2562</key>
-		<string>345 221 590 505 0 0 1280 778 </string>
+		<string>345 220 590 505 0 0 1280 778 </string>
 		<key>2668</key>
-		<string>345 257 590 457 0 0 1280 778 </string>
+		<string>345 256 590 457 0 0 1280 778 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>489.0</string>
@@ -27,13 +27,12 @@
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2265</integer>
+		<integer>2562</integer>
+		<integer>2523</integer>
 		<integer>2311</integer>
-		<integer>2668</integer>
 		<integer>2440</integer>
-		<integer>2562</integer>
+		<integer>2668</integer>
 		<integer>2330</integer>
-		<integer>2523</integer>
 		<integer>1530</integer>
 	</array>
 	<key>IBSystem Version</key>
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 045d528..79d7a11 100644
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 04ff036..06d7f66 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -93,7 +93,6 @@
     IBOutlet id o_intf_fspanel_ckb;
     IBOutlet id o_intf_lang_pop;
     IBOutlet id o_intf_lang_txt;
-    IBOutlet id o_intf_meta_ckb;
     IBOutlet id o_intf_network_box;
     IBOutlet id o_intf_view;
 
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index d3ea3db..89cbd6d 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -258,7 +258,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [o_intf_embedded_ckb setTitle: _NS("Add controls to the video window")];
     [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")];
     [o_intf_lang_txt setStringValue: _NS("Language")];
-    [o_intf_meta_ckb setTitle: _NS("Fetch the metadata from the Internet")];
     [o_intf_network_box setTitle: _NS("Privacy / Network Interaction")];
     
     /* Subtitles and OSD */
@@ -365,7 +364,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     SetupStringList( o_intf_lang_pop, "language" );
     SetupIntList( o_intf_art_pop, "album-art" );
 
-    [o_intf_meta_ckb setState: config_GetInt( p_intf, "fetch-meta" )];
     [o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )];
     [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )];
 
@@ -684,13 +682,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         SaveStringList( o_intf_lang_pop, "language" );
         SaveIntList( o_intf_art_pop, "album-art" );
 
-        config_PutInt( p_intf, "fetch-meta", [o_intf_meta_ckb state] );
         config_PutInt( p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state] );
         config_PutInt( p_intf, "embedded-video", [o_intf_embedded_ckb state] );
 
         /* okay, let's save our changes to vlcrc */
         i = config_SaveConfigFile( p_intf, "main" );
-        i = config_SaveConfigFile( p_intf, "macosx" );
+        i = i + config_SaveConfigFile( p_intf, "macosx" );
 
         if( i != 0 )
         {