Skip to content

Commit c82f6e8

Browse files
authored
Process: drop WNCK (#459)
1 parent 43e3903 commit c82f6e8

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: |
2626
apt update
2727
apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libhandy-1-dev \
28-
libdbus-glib-1-dev libwnck-3-dev libgtop2-dev libwingpanel-3.0-dev libudisks2-dev \
28+
libdbus-glib-1-dev libgtop2-dev libwingpanel-3.0-dev libudisks2-dev \
2929
libxnvctrl0 libxnvctrl-dev libcurl4-gnutls-dev libflatpak-dev libjson-glib-dev \
3030
liblivechart-1-dev libpci-dev \
3131
meson valac sassc git

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ Monitor will be available from the Applications menu.
3838
If you plan to install WITH a wingpanel-indicator
3939

4040
```bash
41-
sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev libwingpanel-dev meson
41+
sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev libwingpanel-dev meson
4242
```
4343

4444
Alternatively, if you plan to install WITHOUT a wingpanel-indicator
4545

4646
```bash
47-
sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev meson
47+
sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev meson
4848
```
4949

5050

meson.build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ vapidir = meson.current_source_dir() / 'vapi/'
1515
add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language: 'c')
1616

1717
add_project_arguments(['--vapidir', vapidir], language: 'vala')
18-
add_project_arguments(['-DWNCK_I_KNOW_THIS_IS_UNSTABLE', '-w'], language: 'c')
1918

2019
# subprojects should be skipped: https://mesonbuild.com/Release-notes-for-0-58-0.html#skip-subprojects-installation
2120
# needs meson 0.58.0
@@ -29,7 +28,6 @@ app_dependencies = [
2928
dependency('gio-2.0'),
3029
dependency('gobject-2.0'),
3130
dependency('libgtop-2.0'),
32-
dependency('libwnck-3.0'),
3331
dependency('libhandy-1', version: '>=0.90.0'),
3432
dependency('gdk-x11-3.0'),
3533
dependency('x11'),

src/Managers/Process.vala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,6 @@ public class Monitor.Process : GLib.Object {
322322
GTop.get_proc_mem (out proc_mem, stat.pid);
323323
mem_usage = (proc_mem.resident - proc_mem.share) / 1024; // in KiB
324324

325-
// also if it is using X Window Server
326-
if (Gdk.Display.get_default () is Gdk.X11.Display) {
327-
Wnck.ResourceUsage resu = Wnck.ResourceUsage.pid_read (Gdk.Display.get_default (), stat.pid);
328-
mem_usage += (resu.total_bytes_estimate / 1024);
329-
}
330-
331325
var total_installed_memory = (double) mem.total / 1024;
332326
mem_percentage = (mem_usage / total_installed_memory) * 100;
333327

0 commit comments

Comments
 (0)