[vlc-commits] macosx: prevent unwanted strings from being displayed instead of empty strings as suggested by xtophe

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Feb 17 18:33:36 2012 +0100| [84eee5c2fda0508547f3f4c479d9df8162acf1d9] | committer: Jean-Baptiste Kempf

macosx: prevent unwanted strings from being displayed instead of empty strings as suggested by xtophe
(cherry picked from commit a97666db8a5ee0eb8498cc068c4fe3a8d76e1783)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/macosx/prefs.m        |    9 ++++++++-
 modules/gui/macosx/simple_prefs.m |   14 +++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index dc91a39..11eb51a 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -478,13 +478,20 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 @implementation VLCTreePluginItem
 - (id)initWithPlugin:(module_t *)plugin
 {
-    NSString * name = _NS( module_get_name( plugin, false )?:"" );
+    const char * psz_name = module_get_name( plugin, false );
+    NSString * name;
+    if (psz_name)
+        name = _NS(psz_name);
+    else
+        name = @"";
+
     if(self = [super initWithName:name])
     {
         _configItems = module_config_get( plugin, &_configSize );
         //_plugin = plugin;
         //_help = [_NS(config_CategoryHelpGet( subCategory )) retain];
     }
+
     return self;
 }
 
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 1d83806..c19564e 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -437,7 +437,19 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
 - (void)setupButton: (NSButton *)object forBoolValue: (const char *)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