[vlc-devel] commit: Remove intf_UserStringInput ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  8 16:36:24 2009 +0200| [e598037c33232fd0a7d7d1087a6bd4791b3875ce] | committer: Rémi Denis-Courmont 

Remove intf_UserStringInput

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

 include/vlc_interface.h     |    3 +--
 src/interface/interaction.c |   34 ----------------------------------
 src/libvlccore.sym          |    1 -
 3 files changed, 1 insertions(+), 37 deletions(-)

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index b11f328..0228b14 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -279,8 +279,7 @@ enum
  * Exported symbols
  ***************************************************************************/
 
-#define intf_UserStringInput( a, b, c, d ) __intf_UserStringInput( VLC_OBJECT(a),b,c,d )
-VLC_EXPORT( int, __intf_UserStringInput,(vlc_object_t*, const char*, const char*, char **) );
+#define intf_UserStringInput( a, b, c, d ) (VLC_OBJECT(a),b,c,d, VLC_EGENERIC)
 
 #define intf_IntfProgress( a, b, c ) __intf_Progress( VLC_OBJECT(a), NULL, b,c, -1 )
 #define intf_UserProgress( a, b, c, d, e ) __intf_Progress( VLC_OBJECT(a),b,c,d,e )
diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index fbb141b..936f7b4 100644
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -169,40 +169,6 @@ bool intf_ProgressIsCancelled( interaction_dialog_t *p_dialog )
 }
 
 /**
- * Helper function to make a dialogue asking the user for !password string
- *
- * \param p_this           Parent vlc_object
- * \param psz_title        Title for the dialog
- * \param psz_description  A description
- * \param ppsz_usersString Returned login
- * \return                 Clicked button code
- */
-int __intf_UserStringInput( vlc_object_t *p_this,
-        const char *psz_title,
-        const char *psz_description,
-        char **ppsz_usersString )
-{
-    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->i_flags = DIALOG_PSZ_INPUT_OK_CANCEL;
-
-    i_ret = DialogSend( p_new );
-
-    if( i_ret == VLC_EGENERIC )
-        DialogDestroy( p_new );
-    else if( i_ret != DIALOG_CANCELLED )
-    {
-        *ppsz_usersString = p_new->psz_returned[0]?
-            strdup( p_new->psz_returned[0] ) : NULL;
-    }
-    return i_ret;
-}
-
-/**
  * Hide an interaction dialog
  *
  * \param p_dialog the dialog to hide
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 0a61bbd..7116000 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -201,7 +201,6 @@ intf_ProgressUpdate
 intf_RunThread
 intf_StopThread
 intf_UserHide
-__intf_UserStringInput
 IsUTF8
 libvlc_InternalAddIntf
 libvlc_InternalCleanup