From 03e43fb31db21e32964ea447023db49fae668b3a Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 May 2019 09:48:57 +0200 Subject: [PATCH] refactor: remove wlroots dependency --- .travis.yml | 2 +- meson.build | 2 -- src/modules/network.cpp | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec87992e..db6e17bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ script: - echo FROM alexays/waybar:${distro} > Dockerfile - echo ADD . /root >> Dockerfile - docker build -t waybar . - - docker run waybar /bin/sh -c "cd /root && git clone --depth=1 https://github.com/swaywm/wlroots subprojects/wlroots && meson build && ninja -C build" \ No newline at end of file + - docker run waybar /bin/sh -c "cd /root && meson build && ninja -C build" \ No newline at end of file diff --git a/meson.build b/meson.build index 8882e903..47f4e83e 100644 --- a/meson.build +++ b/meson.build @@ -51,7 +51,6 @@ fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep']) wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') wayland_protos = dependency('wayland-protocols') -wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots']) gtkmm = dependency('gtkmm-3.0') dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk')) giounix = dependency('gio-unix-2.0', required: get_option('dbusmenu-gtk')) @@ -125,7 +124,6 @@ executable( src_files, dependencies: [ thread_dep, - wlroots, client_protos, wayland_client, fmt, diff --git a/src/modules/network.cpp b/src/modules/network.cpp index d75d83a5..be5bd9e1 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -593,6 +593,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { } // Check for valid interface if (rtif->ifi_index == net->ifid_) { + net->linked_ = true; // Get Iface and WIFI info net->getInterfaceAddress(); net->thread_timer_.wake_up();