From 7cba3abbd08c96099b52630912e21d3e24ec91e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 7 Mar 2009 23:23:26 +0200 Subject: [PATCH] Remove intf_UserLoginPassword --- include/vlc_interface.h | 2 -- src/interface/interaction.c | 40 ------------------------------------- src/libvlccore.sym | 1 - 3 files changed, 43 deletions(-) diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 78388518a4..4e85c63846 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -279,8 +279,6 @@ enum * Exported symbols ***************************************************************************/ -#define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e) -VLC_EXPORT( int, __intf_UserLoginPassword,( vlc_object_t*, const char*, const char*, char **, char **) ); #define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f ) VLC_EXPORT( int, __intf_UserYesNo,( vlc_object_t*, const char*, const char*, const char*, const char*, const char*) ); #define intf_UserStringInput( a, b, c, d ) __intf_UserStringInput( VLC_OBJECT(a),b,c,d ) diff --git a/src/interface/interaction.c b/src/interface/interaction.c index 77829884e7..dfbff7f078 100644 --- a/src/interface/interaction.c +++ b/src/interface/interaction.c @@ -212,46 +212,6 @@ bool intf_ProgressIsCancelled( interaction_dialog_t *p_dialog ) return b_cancel; } -/** - * Helper function to make a login/password dialogue - * - * \param p_this Parent vlc_object - * \param psz_title Title for the dialog - * \param psz_description A description - * \param ppsz_login Returned login - * \param ppsz_password Returned password - * \return Clicked button code - */ -int __intf_UserLoginPassword( vlc_object_t *p_this, - const char *psz_title, - const char *psz_description, - char **ppsz_login, - char **ppsz_password ) -{ - int i_ret; - DIALOG_INIT( TWOWAY, VLC_EGENERIC ); - p_new->i_type = INTERACT_DIALOG_TWOWAY; - p_new->psz_title = strdup( psz_title ); - p_new->psz_description = strdup( psz_description ); - p_new->psz_default_button = strdup( _("OK" ) ); - p_new->psz_alternate_button = strdup( _("Cancel" ) ); - - p_new->i_flags = DIALOG_LOGIN_PW_OK_CANCEL; - - i_ret = DialogSend( p_new ); - - if( i_ret == VLC_EGENERIC ) - DialogDestroy( p_new ); - else if( i_ret != DIALOG_CANCELLED ) - { - *ppsz_login = p_new->psz_returned[0]? - strdup( p_new->psz_returned[0] ) : NULL; - *ppsz_password = p_new->psz_returned[1]? - strdup( p_new->psz_returned[1] ) : NULL; - } - return i_ret; -} - /** * Helper function to make a dialogue asking the user for !password string * diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 2e1c19ebf9..4cfca8a9db 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -200,7 +200,6 @@ intf_ProgressUpdate intf_RunThread intf_StopThread intf_UserHide -__intf_UserLoginPassword __intf_UserStringInput __intf_UserYesNo IsUTF8 -- 2.39.2