Skip to content

Commit

Permalink
refactor: remove wlroots dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexays committed May 20, 2019
1 parent 913d0f7 commit 03e43fb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
- docker run waybar /bin/sh -c "cd /root && meson build && ninja -C build"
2 changes: 0 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down Expand Up @@ -125,7 +124,6 @@ executable(
src_files,
dependencies: [
thread_dep,
wlroots,
client_protos,
wayland_client,
fmt,
Expand Down
1 change: 1 addition & 0 deletions src/modules/network.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 03e43fb

Please sign in to comment.