luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the correct default value for XDG_DATA_DIRS environment variable.

Browse source 
[GB.DESKTOP]
* BUG: Use the correct default value for XDG_DATA_DIRS environment variable.
This commit is contained in:
gambas 2018-08-10 11:54:30 +02:00
parent a6a8d04b99
commit d189a564e3
5 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
comp/src/gb.desktop/.component
View file

@ -1,6 +1,6 @@
[Component]
Key=gb.desktop
Version=3.10.90
Version=3.11.90
State=1
Needs=Form
Requires=gb.image

2
comp/src/gb.desktop/.project
View file

@ -1,7 +1,7 @@
# Gambas Project File 3.0
Title=Desktop-neutral routines from Portland project
Startup=Main
Version=3.10.90
Version=3.11.90
VersionFile=1
Component=gb.image
Component=gb.gui

18
comp/src/gb.desktop/.settings
View file

@ -141,19 +141,11 @@ Path="gb.desktop.gambas"
LastCommit="[GB.DESKTOP]\n* BUG: Don't use 'gb.desktop.gnome' anymore, as libgnome-keyring is deprecated. Use the 'secret-tool' program only."
[OpenFile]
File[1]=".src/_Desktop_Passwords.class:0.174"
Active=3
Count=11
File[2]=".src/Desktop.class:13.575"
File[3]=".src/Main.module:0.174"
File[4]=".src/DesktopMime.class:0.2"
File[5]=".src/Atom.class:9.2"
File[6]=".src/DesktopWatcher.class:9.4"
File[7]=".src/DesktopWindow.class:9.4"
File[8]=".src/Tests/Form1.class:9.2"
File[9]=".src/_DesktopVirtual.class:0.5"
File[10]=".src/_Desktop_Windows.class:9.5"
File[11]=".src/DesktopFile.class:0.30"
File[1]=".src/Desktop.class:0.16"
Active=2
Count=3
File[2]=".src/DesktopFile.class:40.500"
File[3]=".src/Main.module:21.143"
[VersionControl]
User="gambas"

8
comp/src/gb.desktop/.src/Main.module
View file

@ -143,9 +143,13 @@ End
Public Sub GetDataDir() As String[]
Dim sDir As String
If Not $aDataDir Then
$aDataDir = Split(Desktop.DataDir, ":", "", True)
$aDataDir.Insert(Split(Env["XDG_DATA_DIRS"], ":", "", True))
$aDataDir = [Desktop.DataDir] 'Split(Desktop.DataDir, ":", "", True)
sDir = Env["XDG_DATA_DIRS"]
If Not sDir Then sDir = "/usr/local/share:/usr/share"
$aDataDir.Insert(Split(sDir, ":", "", True))
Endif
Return $aDataDir

2
comp/src/gb.desktop/.startup
View file

@ -2,7 +2,7 @@ Main
Desktop-neutral routines from Portland project
0
0
3.10.90
3.11.90
gb.image
gb.gui