Renamed files and icons accordingly to the uniq app id

14 files changed, 16 insertions, 19 deletions

diff --git a/data/desktop/128x128/apps/remmina.png b/data/desktop/128x128/apps/org.remmina.Remmina.png
index 8c48762df..8c48762df 100755
--- a/data/desktop/128x128/apps/remmina.png
+++ b/data/desktop/128x128/apps/org.remmina.Remmina.png
diff --git a/data/desktop/16x16/apps/remmina.png b/data/desktop/16x16/apps/org.remmina.Remmina.png
index dffbd488d..dffbd488d 100644
--- a/data/desktop/16x16/apps/remmina.png
+++ b/data/desktop/16x16/apps/org.remmina.Remmina.png
diff --git a/data/desktop/22x22/apps/remmina.png b/data/desktop/22x22/apps/org.remmina.Remmina.png
index 86a1a1fdf..86a1a1fdf 100644
--- a/data/desktop/22x22/apps/remmina.png
+++ b/data/desktop/22x22/apps/org.remmina.Remmina.png
diff --git a/data/desktop/24x24/apps/remmina.png b/data/desktop/24x24/apps/org.remmina.Remmina.png
index 2725a5278..2725a5278 100644
--- a/data/desktop/24x24/apps/remmina.png
+++ b/data/desktop/24x24/apps/org.remmina.Remmina.png
diff --git a/data/desktop/32x32/apps/remmina.png b/data/desktop/32x32/apps/org.remmina.Remmina.png
index 32fe618cb..32fe618cb 100644
--- a/data/desktop/32x32/apps/remmina.png
+++ b/data/desktop/32x32/apps/org.remmina.Remmina.png
diff --git a/data/desktop/48x48/apps/remmina.png b/data/desktop/48x48/apps/org.remmina.Remmina.png
index ff8fe2881..ff8fe2881 100644
--- a/data/desktop/48x48/apps/remmina.png
+++ b/data/desktop/48x48/apps/org.remmina.Remmina.png
diff --git a/data/desktop/64x64/apps/remmina.png b/data/desktop/64x64/apps/org.remmina.Remmina.png
index 14cca420d..14cca420d 100755
--- a/data/desktop/64x64/apps/remmina.png
+++ b/data/desktop/64x64/apps/org.remmina.Remmina.png
diff --git a/data/desktop/72x72/apps/remmina.png b/data/desktop/72x72/apps/org.remmina.Remmina.png
index dd7ff3eea..dd7ff3eea 100755
--- a/data/desktop/72x72/apps/remmina.png
+++ b/data/desktop/72x72/apps/org.remmina.Remmina.png
diff --git a/data/desktop/96x96/apps/remmina.png b/data/desktop/96x96/apps/org.remmina.Remmina.png
index 0be4005d0..0be4005d0 100755
--- a/data/desktop/96x96/apps/remmina.png
+++ b/data/desktop/96x96/apps/org.remmina.Remmina.png
diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt
index 73b426f3c..57a3827ce 100644
--- a/data/desktop/CMakeLists.txt
+++ b/data/desktop/CMakeLists.txt
@@ -44,22 +44,22 @@ set(ICON96_DIR "${REMMINA_DATADIR}/icons/hicolor/96x96/apps")
 set(ICON128_DIR "${REMMINA_DATADIR}/icons/hicolor/128x128/apps")
 set(ICONSVG_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/apps")
 
-set(ICON16_DATA 16x16/apps/remmina.png)
-set(ICON22_DATA 22x22/apps/remmina.png)
-set(ICON24_DATA 24x24/apps/remmina.png)
+set(ICON16_DATA 16x16/apps/org.remmina.Remmina.png)
+set(ICON22_DATA 22x22/apps/org.remmina.Remmina.png)
+set(ICON24_DATA 24x24/apps/org.remmina.Remmina.png)
 set(ICON16_DATA_PANEL 16x16/apps/remmina-panel.png)
 set(ICON22_DATA_PANEL 22x22/apps/remmina-panel.png)
 set(ICON24_DATA_PANEL 24x24/apps/remmina-panel.png)
 set(ICON16_DATA_PANEL_LIGHT 16x16/apps/remmina-panel-inverted.png)
 set(ICON22_DATA_PANEL_LIGHT 22x22/apps/remmina-panel-inverted.png)
 set(ICON24_DATA_PANEL_LIGHT 24x24/apps/remmina-panel-inverted.png)
-set(ICON32_DATA 32x32/apps/remmina.png)
-set(ICON48_DATA 48x48/apps/remmina.png)
-set(ICON64_DATA 64x64/apps/remmina.png)
-set(ICON72_DATA 72x72/apps/remmina.png)
-set(ICON96_DATA 96x96/apps/remmina.png)
-set(ICON128_DATA 128x128/apps/remmina.png)
-set(ICONSVG_DATA scalable/apps/remmina.svg)
+set(ICON32_DATA 32x32/apps/org.remmina.Remmina.png)
+set(ICON48_DATA 48x48/apps/org.remmina.Remmina.png)
+set(ICON64_DATA 64x64/apps/org.remmina.Remmina.png)
+set(ICON72_DATA 72x72/apps/org.remmina.Remmina.png)
+set(ICON96_DATA 96x96/apps/org.remmina.Remmina.png)
+set(ICON128_DATA 128x128/apps/org.remmina.Remmina.png)
+set(ICONSVG_DATA scalable/apps/org.remmina.Remmina.svg)
 
 install(FILES ${ICON16_DATA} DESTINATION ${ICON16_DIR})
 install(FILES ${ICON22_DATA} DESTINATION ${ICON22_DIR})
@@ -79,19 +79,17 @@ install(FILES ${ICON128_DATA} DESTINATION ${ICON128_DIR})
 install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR})
 
 set(REMMINA_BINARY_PATH ${CMAKE_INSTALL_FULL_BINDIR}/remmina)
-set(REMMINA_ICON "remmina")
+set(REMMINA_ICON "org.remmina.Remmina")
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina.desktop.in
-    ${CMAKE_CURRENT_BINARY_DIR}/remmina.desktop @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.remmina.Remmina.desktop.in
+    ${CMAKE_CURRENT_BINARY_DIR}/org.remmina.Remmina.desktop @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina-file.desktop.in
     ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.desktop
-    RENAME ${UNIQUE_APPNAME}.desktop
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.remmina.Remmina.desktop
     DESTINATION "${REMMINA_DATADIR}/applications")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop
     DESTINATION "${REMMINA_DATADIR}/applications")
-install(FILES appdata.xml
-    RENAME ${UNIQUE_APPNAME}.appdata.xml
+install(FILES org.remmina.Remmina.appdata.xml
     DESTINATION "${REMMINA_DATADIR}/metainfo")
 # XML mime types
 set( SHARED_MIME_INFO_MINIMUM_VERSION "0.30" )
@@ -101,4 +99,3 @@ if( SHARED_MIME_INFO_FOUND )
     install( FILES remmina-mime.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
     update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
 endif()
-
diff --git a/data/desktop/appdata.xml b/data/desktop/org.remmina.Remmina.appdata.xml
index 7dad37d94..7dad37d94 100644
--- a/data/desktop/appdata.xml
+++ b/data/desktop/org.remmina.Remmina.appdata.xml
diff --git a/data/desktop/remmina.desktop.in b/data/desktop/org.remmina.Remmina.desktop.in
index 10ec94ac8..10ec94ac8 100644
--- a/data/desktop/remmina.desktop.in
+++ b/data/desktop/org.remmina.Remmina.desktop.in
diff --git a/data/desktop/remmina-mime.xml b/data/desktop/remmina-mime.xml
index bbb7a8c54..b47a90582 100644
--- a/data/desktop/remmina-mime.xml
+++ b/data/desktop/remmina-mime.xml
@@ -7,6 +7,6 @@
         <glob pattern="*.rdp"/>
         <glob pattern="*.rdpx"/>
         <glob pattern="*.RDP"/>
-        <icon name="remmina"/>
+        <icon name="org.remmina.Remmina"/>
     </mime-type>
 </mime-info>
diff --git a/data/desktop/scalable/apps/remmina.svg b/data/desktop/scalable/apps/org.remmina.Remmina.svg
index 733a721d7..733a721d7 100644
--- a/data/desktop/scalable/apps/remmina.svg
+++ b/data/desktop/scalable/apps/org.remmina.Remmina.svg