Commit 455e82f1 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Revert "macosx: prevent unwanted strings from being displayed instead of empty...

Revert "macosx: prevent unwanted strings from being displayed instead of empty strings as suggested by xtophe"

This reverts commit 84eee5c2.
parent 421a4fc5
...@@ -478,20 +478,13 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -478,20 +478,13 @@ static VLCPrefs *_o_sharedMainInstance = nil;
@implementation VLCTreePluginItem @implementation VLCTreePluginItem
- (id)initWithPlugin:(module_t *)plugin - (id)initWithPlugin:(module_t *)plugin
{ {
const char * psz_name = module_get_name( plugin, false ); NSString * name = _NS( module_get_name( plugin, false )?:"" );
NSString * name;
if (psz_name)
name = _NS(psz_name);
else
name = @"";
if(self = [super initWithName:name]) if(self = [super initWithName:name])
{ {
_configItems = module_config_get( plugin, &_configSize ); _configItems = module_config_get( plugin, &_configSize );
//_plugin = plugin; //_plugin = plugin;
//_help = [_NS(config_CategoryHelpGet( subCategory )) retain]; //_help = [_NS(config_CategoryHelpGet( subCategory )) retain];
} }
return self; return self;
} }
......
...@@ -437,19 +437,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na ...@@ -437,19 +437,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
- (void)setupButton: (NSButton *)object forBoolValue: (const char *)name - (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
{ {
[object setState: config_GetInt( p_intf, name )]; [object setState: config_GetInt( p_intf, name )];
[object setToolTip: _NS(config_GetLabel( p_intf, name ) ?: "")];
char * psz_label = config_GetLabel( p_intf, name );
NSString * o_label;
if (psz_label)
{
o_label = _NS(psz_label);
free( psz_label );
}
else
o_label = @"";
[object setToolTip: o_label];
} }
- (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option - (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment