Merge remote-tracking branch 'origin/master' into snappy

janbar · Sep 25, 2017 · 5664ce8 · 5664ce8
2 parents 041ce46 + bb5b014
commit 5664ce8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,9 +25,9 @@ set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
 option(INSTALL_TESTS "Install the tests on make install" on)
 option(CLICK_MODE "Installs to a contained location" on)
 
-set(APP_VERSION       2.4.9)
+set(APP_VERSION       2.4.11)
 set(APP_NAME          noson)
-set(APP_ID            "noson")
+set(APP_ID            "noson.janbar")
 set(MAIN_QML          "Main.qml")
 set(ICON              "noson.png")
 set(ICON_FILE         "app/graphics/noson.png")
@@ -60,7 +60,7 @@ if(CLICK_MODE)
 else(CLICK_MODE)
     # Standard install paths
     include(GNUInstallDirs)
-    set(APP_HARDCODE ${APP_ID})
+    set(APP_HARDCODE "noson")
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
     set(NOSONAPP_DIR ${CMAKE_INSTALL_PREFIX}/${DATA_DIR})

diff --git a/app/Main.qml b/app/Main.qml
@@ -36,7 +36,7 @@ import "./ui"
 
 MainView {
     objectName: "nosonMainView"
-    applicationName: "noson"
+    applicationName: "noson.janbar"
     id: mainView
 
     backgroundColor: styleMusic.mainView.backgroundColor

diff --git a/manifest.json.in b/manifest.json.in
@@ -1,5 +1,5 @@
 {
-    "name": "@APP_ID@.janbar",
+    "name": "@APP_ID@",
     "description": "A fast and smart SONOS controller for Ubuntu platforms: phone, touch and desktop.",
     "architecture": "@CLICK_ARCH@",
     "title": "@APP_NAME@",