Remove libvlc->psz_homedir and use config_GetHomeDir() instead

[vlc] / modules / misc / lua / vlc.c

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index de12892169f4e6886955360529d5c7423031650b..75adb224461c8937c2b953748bf425ead3526fc0 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -58,15 +58,15 @@
 vlc_module_begin();
     add_submodule();
         set_shortname( N_( "Lua Art" ) );
-        set_description( _("Fetch artwork using lua scripts") );
+        set_description( N_("Fetch artwork using lua scripts") );
         set_capability( "art finder", 10 );
         set_callbacks( FindArt, NULL );
     add_submodule();
         add_shortcut( "luaplaylist" );
         set_category( CAT_INPUT );
         set_subcategory( SUBCAT_INPUT_DEMUX );
-        set_shortname( _("Lua Playlist") );
-        set_description( _("Lua Playlist Parser Interface") );
+        set_shortname( N_("Lua Playlist") );
+        set_description( N_("Lua Playlist Parser Interface") );
         set_capability( "demux", 2 );
         set_callbacks( Import_LuaPlaylist, Close_LuaPlaylist );
     add_submodule();
@@ -79,7 +79,7 @@ vlc_module_begin();
         /* add_shortcut( "telnet" ); */
         add_shortcut( "luahttp" );
         /* add_shortcut( "http" ); */
-        set_description( _("Lua Interface Module") );
+        set_description( N_("Lua Interface Module") );
         set_capability( "interface", 0 );
         add_string( "lua-intf", "dummy", NULL,
                     INTF_TEXT, INTF_LONGTEXT, false );
@@ -160,7 +160,7 @@ int vlclua_datadir( lua_State *L )
 }
 int vlclua_homedir( lua_State *L )
 {
-    lua_pushstring( L, vlclua_get_this( L )->p_libvlc->psz_homedir );
+    lua_pushstring( L, config_GetHomeDir() );
     return 1;
 }
 int vlclua_configdir( lua_State *L )
@@ -425,17 +425,10 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
                       psz_vlcpath, luadirname )  < 0 )
             return VLC_ENOMEM;
         i++;
-#       ifdef WIN32
-        if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "scripts" DIR_SEP "%s",
+        if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "share" DIR_SEP "lua" DIR_SEP "%s",
                       psz_vlcpath, luadirname )  < 0 )
             return VLC_ENOMEM;
         i++;
-#       else
-         if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "share" DIR_SEP "lua" DIR_SEP "%s",
-                      psz_vlcpath, luadirname )  < 0 )
-            return VLC_ENOMEM;
-        i++;
-#       endif
 
     }
 #   else