jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unset XDG_DATA_DIRS before launching app, resolves #194, reverts #273

Browse Source
This commit is contained in:
Janek Bevendorff
2017-02-09 21:35:17 +01:00
parent 6c45fcbfc7
commit d1b403333c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AppImage-Recipe.sh
View File

@@ -74,6 +74,11 @@ cat << EOF > ./usr/bin/keepassxc_env
#export QT_QPA_PLATFORMTHEME=gtk2 #export QT_QPA_PLATFORMTHEME=gtk2
export LD_LIBRARY_PATH="../opt/qt58/lib:\${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="../opt/qt58/lib:\${LD_LIBRARY_PATH}"
export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}" export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}"
# unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
# see https://github.com/probonopd/AppImageKit/issues/351
unset XDG_DATA_DIRS
exec keepassxc "\$@" exec keepassxc "\$@"
EOF EOF
chmod +x ./usr/bin/keepassxc_env chmod +x ./usr/bin/keepassxc_env

4
src/core/FilePath.cpp
View File

@@ -91,12 +91,12 @@ QString FilePath::pluginPath(const QString& name)
QIcon FilePath::applicationIcon() QIcon FilePath::applicationIcon()
{ {
return icon("apps", "keepassxc", false); return icon("apps", "keepassxc");
} }
QIcon FilePath::trayIconLocked() QIcon FilePath::trayIconLocked()
{ {
return icon("apps", "keepassxc-locked", false); return icon("apps", "keepassxc-locked");
} }
QIcon FilePath::trayIconUnlocked() QIcon FilePath::trayIconUnlocked()