From 287a64544d00782cf2c21e5686f5678d466f234f Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 3 Aug 2021 00:10:26 +0200 Subject: Create desktop profile - data/org.ayatana.indicator.rotation_lock: Add desktop profile - src/rotation-lock.cpp: Create separate functions and icon for Desktop - CMakeLists.txt: Add libayatana-common dependency - src/main.cpp: Run the ADBD handler on Lomiri only --- src/main.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index aaa069d..004b21d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,6 +29,11 @@ #include +extern "C" +{ + #include +} + int main(int /*argc*/, char** /*argv*/) { @@ -58,13 +63,16 @@ main(int /*argc*/, char** /*argv*/) exporters.push_back(exporter); } - // We need the ADBD handler running, - // even though it doesn't have an indicator component yet - static constexpr char const * ADB_SOCKET_PATH {"/dev/socket/adbd"}; - static constexpr char const * PUBLIC_KEYS_FILENAME {"/data/misc/adb/adb_keys"}; - auto usb_monitor = std::make_shared(); - auto greeter = std::make_shared(); - UsbManager usb_manager {ADB_SOCKET_PATH, PUBLIC_KEYS_FILENAME, usb_monitor, greeter}; + if (ayatana_common_utils_is_lomiri()) + { + // We need the ADBD handler running, + // even though it doesn't have an indicator component yet + static constexpr char const * ADB_SOCKET_PATH {"/dev/socket/adbd"}; + static constexpr char const * PUBLIC_KEYS_FILENAME {"/data/misc/adb/adb_keys"}; + auto usb_monitor = std::make_shared(); + auto greeter = std::make_shared(); + UsbManager usb_manager {ADB_SOCKET_PATH, PUBLIC_KEYS_FILENAME, usb_monitor, greeter}; + } // let's go! g_main_loop_run(loop); -- cgit v1.2.3