[chrome-gnome-shell] connector: dropped deprecated manifests



commit 61638ba9c153283b3e9024c0b8555831a1b78b55
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Sun Dec 25 11:21:30 2016 +0400

    connector: dropped deprecated manifests

 CMakeLists.txt                                     |   14 +-------------
 .../io.github.ne0sight.gs_chrome_connector.json    |   10 ----------
 extension/include/constants.js                     |    2 +-
 3 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8391e10..3d25ca2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,8 +155,6 @@ if(BUILD_CONNECTOR)
        add_custom_target(build-connector ALL
                        COMMAND ${PYTHON_EXECUTABLE} ${CONNECTOR_SETUP} build)
 
-       configure_file("${CMAKE_CURRENT_SOURCE_DIR}/connector/io.github.ne0sight.gs_chrome_connector.json"
-                       "${CMAKE_BINARY_DIR}/")
        configure_file("${CMAKE_CURRENT_SOURCE_DIR}/connector/org.gnome.chrome_gnome_shell.json"
                        "${CMAKE_BINARY_DIR}/")
        configure_file("${CMAKE_CURRENT_SOURCE_DIR}/connector/org.gnome.ChromeGnomeShell.service.in"
@@ -168,11 +166,7 @@ if(BUILD_CONNECTOR)
                        COMMAND "${JQ_EXECUTABLE}" -s "'add|del(.allowed_origins)'"
                                "${CMAKE_BINARY_DIR}/org.gnome.chrome_gnome_shell.json"
                                
"${CMAKE_CURRENT_SOURCE_DIR}/connector/org.gnome.chrome_gnome_shell.firefox.json"
-                               > "${CMAKE_BINARY_DIR}/org.gnome.chrome_gnome_shell.firefox.json"
-                       COMMAND "${JQ_EXECUTABLE}" -s "'add|del(.allowed_origins)'"
-                               "${CMAKE_BINARY_DIR}/io.github.ne0sight.gs_chrome_connector.json"
-                               
"${CMAKE_CURRENT_SOURCE_DIR}/connector/org.gnome.chrome_gnome_shell.firefox.json"
-                               > "${CMAKE_BINARY_DIR}/io.github.ne0sight.gs_chrome_connector.firefox.json")
+                               > "${CMAKE_BINARY_DIR}/org.gnome.chrome_gnome_shell.firefox.json")
 
        if(USE_DEBIAN_LAYOUT)
                set(DISTUTILS_EXTRA_ARGS "--install-layout=deb")
@@ -191,13 +185,8 @@ if(BUILD_CONNECTOR)
                                        install ${DISTUTILS_EXTRA_ARGS}
                                                --root \"\${DESTDIR}\"
                                                --prefix \"${CMAKE_INSTALL_PREFIX}\")")
-       install(FILES "${CMAKE_BINARY_DIR}/io.github.ne0sight.gs_chrome_connector.json" DESTINATION 
"/etc/chromium/native-messaging-hosts/")
-       install(FILES "${CMAKE_BINARY_DIR}/io.github.ne0sight.gs_chrome_connector.json" DESTINATION 
"/etc/opt/chrome/native-messaging-hosts/")
        install(FILES "${CMAKE_BINARY_DIR}/org.gnome.chrome_gnome_shell.json" DESTINATION 
"/etc/chromium/native-messaging-hosts/")
        install(FILES "${CMAKE_BINARY_DIR}/org.gnome.chrome_gnome_shell.json" DESTINATION 
"/etc/opt/chrome/native-messaging-hosts/")
-       install(FILES "${CMAKE_BINARY_DIR}/io.github.ne0sight.gs_chrome_connector.firefox.json"
-                       DESTINATION "${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts/"
-                       RENAME "io.github.ne0sight.gs_chrome_connector.json")
        install(FILES "${CMAKE_BINARY_DIR}/org.gnome.chrome_gnome_shell.firefox.json"
                        DESTINATION "${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts/"
                        RENAME "org.gnome.chrome_gnome_shell.json")
@@ -221,7 +210,6 @@ if(BUILD_CONNECTOR)
        # /usr/local/etc/chrome/native-messaging-hosts for native messaging host manifest.
        # https://svn0.us-east.freebsd.org/ports/head/www/chromium/files/patch-chrome_common_chrome__paths.cc
        if(CMAKE_SYSTEM_NAME MATCHES "DragonFly.*|FreeBSD")
-               install(FILES "${CMAKE_BINARY_DIR}/io.github.ne0sight.gs_chrome_connector.json" DESTINATION 
"/usr/local/etc/chrome/native-messaging-hosts/")
                install(FILES "${CMAKE_BINARY_DIR}/org.gnome.chrome_gnome_shell.json" DESTINATION 
"/usr/local/etc/chrome/native-messaging-hosts/")
                install(FILES "${CMAKE_BINARY_DIR}/chrome-gnome-shell.json" DESTINATION 
"/usr/local/etc/chrome/policies/managed/")
        endif(CMAKE_SYSTEM_NAME MATCHES "DragonFly.*|FreeBSD")
diff --git a/extension/include/constants.js b/extension/include/constants.js
index 55e841b..02e2657 100644
--- a/extension/include/constants.js
+++ b/extension/include/constants.js
@@ -33,7 +33,7 @@ EXTENSION_CHANGED_UUID                        = 0;
 EXTENSION_CHANGED_STATE                        = 1;
 EXTENSION_CHANGED_ERROR                        = 2;
 
-NATIVE_HOST                            = 'io.github.ne0sight.gs_chrome_connector';
+NATIVE_HOST                            = 'org.gnome.chrome_gnome_shell';
 
 EXTENSIONS_WEBSITE                     = 'https://extensions.gnome.org/';
 UPDATE_URL                             = EXTENSIONS_WEBSITE + 'update-info/';


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]