Skip to content

Commit b131dd8

Browse files
Explorer09BenBE
andcommitted
Restrict supported modes for text-only meters
Limit display to Text mode only for: * BlankMeter * HostnameMeter * SELinuxMeter (Linux) * SysArchMeter * SystemdMeter (Linux) Co-authored-by: Benny Baumann <[email protected]> Co-authored-by: Kang-Che Sung <[email protected]>
1 parent 1723ed7 commit b131dd8

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

HostnameMeter.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ const MeterClass HostnameMeter_class = {
2929
},
3030
.updateValues = HostnameMeter_updateValues,
3131
.defaultMode = TEXT_METERMODE,
32+
.supportedModes = (1 << TEXT_METERMODE),
3233
.maxItems = 0,
33-
.total = 100.0,
34+
.total = 0.0,
3435
.attributes = HostnameMeter_attributes,
3536
.name = "Hostname",
3637
.uiName = "Hostname",

Meter.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,9 @@ const MeterClass BlankMeter_class = {
535535
},
536536
.updateValues = BlankMeter_updateValues,
537537
.defaultMode = TEXT_METERMODE,
538+
.supportedModes = (1 << TEXT_METERMODE),
538539
.maxItems = 0,
539-
.total = 100.0,
540+
.total = 0.0,
540541
.attributes = BlankMeter_attributes,
541542
.name = "Blank",
542543
.uiName = "Blank",

SysArchMeter.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ const MeterClass SysArchMeter_class = {
3535
},
3636
.updateValues = SysArchMeter_updateValues,
3737
.defaultMode = TEXT_METERMODE,
38+
.supportedModes = (1 << TEXT_METERMODE),
3839
.maxItems = 0,
39-
.total = 100.0,
40+
.total = 0.0,
4041
.attributes = SysArchMeter_attributes,
4142
.name = "System",
4243
.uiName = "System",

linux/SELinuxMeter.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ const MeterClass SELinuxMeter_class = {
8585
},
8686
.updateValues = SELinuxMeter_updateValues,
8787
.defaultMode = TEXT_METERMODE,
88+
.supportedModes = (1 << TEXT_METERMODE),
8889
.maxItems = 0,
89-
.total = 100.0,
90+
.total = 0.0,
9091
.attributes = SELinuxMeter_attributes,
9192
.name = "SELinux",
9293
.uiName = "SELinux",

linux/SystemdMeter.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,9 @@ const MeterClass SystemdMeter_class = {
408408
.updateValues = SystemdMeter_updateValues,
409409
.done = SystemdMeter_done,
410410
.defaultMode = TEXT_METERMODE,
411+
.supportedModes = (1 << TEXT_METERMODE),
411412
.maxItems = 0,
412-
.total = 100.0,
413+
.total = 0.0,
413414
.attributes = SystemdMeter_attributes,
414415
.name = "Systemd",
415416
.uiName = "Systemd state",
@@ -426,8 +427,9 @@ const MeterClass SystemdUserMeter_class = {
426427
.updateValues = SystemdMeter_updateValues,
427428
.done = SystemdMeter_done,
428429
.defaultMode = TEXT_METERMODE,
430+
.supportedModes = (1 << TEXT_METERMODE),
429431
.maxItems = 0,
430-
.total = 100.0,
432+
.total = 0.0,
431433
.attributes = SystemdMeter_attributes,
432434
.name = "SystemdUser",
433435
.uiName = "Systemd user state",

0 commit comments

Comments
 (0)