Commit 7bd1f54f authored by Christophe Massiot's avatar Christophe Massiot
Browse files

* Fixed a segfault in the Japanese preferences panel.

parent 1c68fade
......@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: intf.h,v 1.28 2003/02/16 23:32:06 hartman Exp $
* $Id: intf.h,v 1.29 2003/02/18 00:17:06 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -42,6 +42,7 @@
- (void)initIntlSupport;
- (NSString *)localizedString:(char *)psz;
- (char *)delocalizeString:(NSString *)psz;
- (NSStringEncoding)getEncoding;
- (void)setIntf:(intf_thread_t *)p_intf;
- (intf_thread_t *)getIntf;
......
......@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.58 2003/02/16 23:32:06 hartman Exp $
* $Id: intf.m,v 1.59 2003/02/18 00:17:06 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -181,6 +181,11 @@ static void Run( intf_thread_t *p_intf )
return psz_string;
}
- (NSStringEncoding)getEncoding
{
return i_encoding;
}
- (void)setIntf:(intf_thread_t *)_p_intf
{
p_intf = _p_intf;
......
......@@ -2,7 +2,7 @@
* prefs.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: prefs.m,v 1.12 2003/02/09 19:28:43 massiot Exp $
* $Id: prefs.m,v 1.13 2003/02/18 00:17:06 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
......@@ -245,7 +245,7 @@
#define INPUT_FIELD( ctype, cname, label, w, msg, param, tip ) \
{ \
char * psz_duptip = NULL; \
if ( p_item->psz_longtext != NULL ) \
if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding ) \
psz_duptip = strdup(p_item->psz_longtext); \
s_rc.size.height = 25; \
s_rc.size.width = w; \
......@@ -328,7 +328,7 @@
NSButton *o_btn_select;
NSButton *o_btn_configure;
char * psz_duptip = NULL;
if ( p_item->psz_longtext != NULL )
if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
psz_duptip = strdup(p_item->psz_longtext);
#define MODULE_BUTTON( button, title, sel ) \
......@@ -448,7 +448,7 @@
int i;
VLCComboBox *o_combo_box;
char * psz_duptip = NULL;
if ( p_item->psz_longtext != NULL )
if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
psz_duptip = strdup(p_item->psz_longtext);
s_rc.size.height = 27;
......@@ -509,7 +509,7 @@
{
VLCButton *o_btn_bool;
char * psz_duptip = NULL;
if ( p_item->psz_longtext != NULL )
if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
psz_duptip = strdup(p_item->psz_longtext);
s_rc.size.height = 27;
......
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