* made the look-for-update process faster and more error tolerant

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

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 86fe2306977f9fbcf5472fe2defd38ea80ec2e66..02dff1a1aa41065e78b47df23890185ae8218d77 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * prefs.m: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -312,12 +312,13 @@ static VLCTreeItem *o_root_item = nil;
                     switch( p_item->i_type )
                     {
                     case CONFIG_CATEGORY:
-                       if( p_item->i_value == -1 ) break;
+                                   if( p_item->i_value == -1 ) break;
+
                         o_child_name = [[VLCMain sharedInstance]
-                            localizedString: config_CategoryNameGet( p_item->i_value ) ];
+                            localizedString: config_CategoryNameGet( p_item->i_value )];
                         o_child_title = o_child_name;
                         o_child_help = [[VLCMain sharedInstance]
-                            localizedString: config_CategoryHelpGet( p_item->i_value ) ];
+                            localizedString: config_CategoryHelpGet( p_item->i_value )];
                         p_last_category = [VLCTreeItem alloc];
                         [o_children addObject:[p_last_category
                             initWithName: o_child_name
@@ -330,15 +331,22 @@ static VLCTreeItem *o_root_item = nil;
                             whithCategory: p_item - p_module->p_config]];
                         break;
                     case CONFIG_SUBCATEGORY:
-                       if( p_item->i_value == -1 ) break;
-                        o_child_name = [[VLCMain sharedInstance]
-                            localizedString: config_CategoryNameGet( p_item->i_value ) ];
-                        o_child_title = o_child_name;
-                        o_child_help = [[VLCMain sharedInstance]
-                            localizedString: config_CategoryHelpGet( p_item->i_value ) ];
+                                   if( p_item->i_value == -1 ) break;
+
                         if( p_item->i_value != SUBCAT_PLAYLIST_GENERAL &&
                             p_item->i_value != SUBCAT_VIDEO_GENERAL &&
+                            p_item->i_value != SUBCAT_INPUT_GENERAL &&
+                            p_item->i_value != SUBCAT_INTERFACE_GENERAL &&
+                            p_item->i_value != SUBCAT_SOUT_GENERAL &&
+                            p_item->i_value != SUBCAT_ADVANCED_MISC &&
                             p_item->i_value != SUBCAT_AUDIO_GENERAL )
+                        {
+                            o_child_name = [[VLCMain sharedInstance]
+                                localizedString: config_CategoryNameGet( p_item->i_value ) ];
+                            o_child_title = o_child_name;
+                            o_child_help = [[VLCMain sharedInstance]
+                                localizedString: config_CategoryHelpGet( p_item->i_value ) ];
+
                             [p_last_category->o_children
                                 addObject:[[VLCTreeItem alloc]
                                 initWithName: o_child_name
@@ -349,6 +357,8 @@ static VLCTreeItem *o_root_item = nil;
                                 children:[[NSMutableArray alloc]
                                     initWithCapacity:10]
                                 whithCategory: p_item - p_module->p_config]];
+                        }
+                        
                         break;
                     default:
                         break;
@@ -436,7 +446,7 @@ static VLCTreeItem *o_root_item = nil;
                     parent:p_subcategory_item
                     children:IsALeafNode
                     whithCategory: -1]];
-            }
+                }
         }
         vlc_list_release( p_list );
     }
@@ -536,7 +546,6 @@ static VLCTreeItem *o_root_item = nil;
                 return nil;
             }
             p_item = p_parser->p_config;
-            int i = 0;
 
             p_item = p_parser->p_config + 1;
 
@@ -579,7 +588,6 @@ static VLCTreeItem *o_root_item = nil;
         }
         else
         {
-            int i = 0;
             int i_index;
             p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
             if( !p_list ) return o_view;
@@ -602,7 +610,10 @@ static VLCTreeItem *o_root_item = nil;
             if( ( p_item->i_type == CONFIG_CATEGORY ) &&
               ( ( p_item->i_value == CAT_PLAYLIST )  ||
                 ( p_item->i_value == CAT_AUDIO )  ||
-                ( p_item->i_value == CAT_VIDEO ) ) )
+                ( p_item->i_value == CAT_VIDEO ) ||
+                ( p_item->i_value == CAT_INTERFACE ) ||
+                ( p_item->i_value == CAT_INPUT ) ||
+                ( p_item->i_value == CAT_SOUT ) ) )
                 p_item++;
 
             do