diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2016-03-24 16:16:53 +0000 |
---|---|---|
committer | CI Train Bot <ci-train-bot@canonical.com> | 2016-03-24 16:16:53 +0000 |
commit | e3fa9582a01f14e6d80e00d375361a76df716895 (patch) | |
tree | 7b9521ad7cfa7a2e765be265d5ecd98cb9bcad23 /src/main.cpp | |
parent | d2f14e07000e9a5ee418bcbcd34c5ae57bd45590 (diff) | |
parent | 194d7e85a52cbc0060a2d85b71b9ddd8b606aee4 (diff) | |
download | ayatana-indicator-display-e3fa9582a01f14e6d80e00d375361a76df716895.tar.gz ayatana-indicator-display-e3fa9582a01f14e6d80e00d375361a76df716895.tar.bz2 ayatana-indicator-display-e3fa9582a01f14e6d80e00d375361a76df716895.zip |
When a new device appears to ADB, prompt the user whether or not to allow the connection.
Approved by: PS Jenkins bot, Charles Kerr, Xavi Garcia
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 86bdeb3..52cdd58 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,6 +20,10 @@ #include <src/exporter.h> #include <src/rotation-lock.h> +#include <src/greeter.h> +#include <src/usb-manager.h> +#include <src/usb-monitor.h> + #include <glib/gi18n.h> // bindtextdomain() #include <gio/gio.h> @@ -54,6 +58,15 @@ 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<GUDevUsbMonitor>(); + auto greeter = std::make_shared<UnityGreeter>(); + UsbManager usb_manager {ADB_SOCKET_PATH, PUBLIC_KEYS_FILENAME, usb_monitor, greeter}; + + // let's go! g_main_loop_run(loop); // cleanup |