Changeset 5d09f6000a0b589d63e1fc9c6af4e5b055658203

Show
Ignore:
Timestamp:
01/08/06 00:51:43 (2 years ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1154386303 +0000
git-parent:

[52679672fc97ad174da8673a26e09ad78c2adb36]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1154386303 +0000
Message:

* interaction.c: always show errors through the interaction framework, even if the user disabled its usage
* macosx/*: minor clean-up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/interaction.h

    rd57320b r5d09f60  
    9393} 
    9494- (IBAction)cleanupTable:(id)sender; 
     95- (IBAction)showMessages:(id)sender; 
    9596 
    9697-(void)showPanel; 

  • modules/gui/macosx/intf.m

    rd57320b r5d09f60  
    13101310{ 
    13111311    int i_start, i_stop; 
    1312     vlc_value_t quiet; 
    13131312 
    13141313    vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); 
    …… 
    13641363 
    13651364            [o_msg_lock unlock]; 
    1366  
    1367             var_Get( p_intf->p_vlc, "verbose", &quiet ); 
    13681365        } 
    13691366 

  • src/interface/interaction.c

    r0a9dbda r5d09f60  
    7676    if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC; 
    7777 
    78     if( !config_GetInt(p_this, "interact") ) return VLC_EGENERIC; 
    79  
    80     p_dialog->p_interaction = p_interaction; 
    81     p_dialog->p_parent = p_this; 
    82  
    83     if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY ) 
    84     { 
    85         return intf_WaitAnswer( p_interaction, p_dialog ); 
     78    if( config_GetInt(p_this, "interact") ||  
     79        p_dialog->i_flags & DIALOG_BLOCKING_ERROR || 
     80        p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) 
     81    { 
     82        p_dialog->p_interaction = p_interaction; 
     83        p_dialog->p_parent = p_this; 
     84 
     85        if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY ) 
     86        { 
     87            return intf_WaitAnswer( p_interaction, p_dialog ); 
     88        } 
     89        else 
     90        { 
     91            p_dialog->i_flags |=  DIALOG_GOT_ANSWER; 
     92            return intf_Send( p_interaction, p_dialog ); 
     93        } 
    8694    } 
    8795    else 
    88     { 
    89         p_dialog->i_flags |=  DIALOG_GOT_ANSWER; 
    90         return intf_Send( p_interaction, p_dialog ); 
    91     } 
     96        return VLC_EGENERIC; 
    9297} 
    9398 
    …… 
    254259     
    255260    p_new->psz_title = strdup( psz_title ); 
     261    p_new->i_type = INTERACT_DIALOG_ONEWAY; 
    256262 
    257263    va_start( args, psz_format ); 
    …… 
    282288     
    283289    p_new->psz_title = strdup( psz_title ); 
     290    p_new->i_type = INTERACT_DIALOG_ONEWAY; 
    284291 
    285292    va_start( args, psz_format );