Skip to content

Commit

Permalink
Fix icon name in desktop file with ownBrander themes
Browse files Browse the repository at this point in the history
Fixes broken icon reference in desktop entries for some branded build themes.
The icon files are not named by the executable name, but by the short name.
  • Loading branch information
Fabian Müller authored and TheOneRing committed Oct 15, 2021
1 parent cfa0554 commit a51a227
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ if(BUILD_CLIENT)
find_package(SQLite3 3.9.0 REQUIRED)
endif()

# in the ownBrander themes, the icon files are named after the shortname
# the theme included in this repository defines a custom icon name, therefore we set the shortname as a fallback if the
# theme does not define the variable
if (NOT DEFINED APPLICATION_ICON_NAME)
set(APPLICATION_ICON_NAME "${APPLICATION_SHORTNAME}")
endif()
Expand Down
7 changes: 7 additions & 0 deletions changelog/unreleased/9150
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Bugfix: Fix icon name in desktop file with ownBrander themes

Fixes broken icon reference in desktop entries for some branded build themes.

https://github.com/owncloud/client/issues/8992
https://github.com/owncloud/client/pull/9150

6 changes: 3 additions & 3 deletions mirall.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@ --showsettings
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Icon=@APPLICATION_ICON_NAME@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
X-GNOME-Autostart-Delay=3
MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
Expand Down Expand Up @@ -210,9 +210,9 @@ Icon[lb]=@APPLICATION_EXECUTABLE@
[Desktop Action Settings]
Exec=@APPLICATION_EXECUTABLE@ --showsettings
Name=Show @APPLICATION_NAME@ settings
Icon=@APPLICATION_EXECUTABLE@
Icon=@APPLICATION_ICON_NAME@

[Desktop Action Quit]
Exec=@APPLICATION_EXECUTABLE@ --quit
Name=Quit @APPLICATION_NAME@
Icon=@APPLICATION_EXECUTABLE@
Icon=@APPLICATION_ICON_NAME@

0 comments on commit a51a227

Please sign in to comment.