Skip to content

Commit 13991df

Browse files
3v1n0jardon
authored andcommitted
d/p: Revert code requiring newer malcontent
1 parent c51adb4 commit 13991df

2 files changed

Lines changed: 52 additions & 0 deletions

File tree

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
2+
Date: Sat, 14 Feb 2026 00:22:31 +0100
3+
Subject: Revert "wellbeing: Synchronize settings with malcontent"
4+
5+
Drop malcontent code requiring new APIs
6+
7+
This reverts commit 17e72fe9fa6ab5c6040ec48f0a520501bf7cc912.
8+
---
9+
panels/wellbeing/cc-wellbeing-panel.c | 22 ----------------------
10+
1 file changed, 22 deletions(-)
11+
12+
diff --git a/panels/wellbeing/cc-wellbeing-panel.c b/panels/wellbeing/cc-wellbeing-panel.c
13+
index ef24fa9..87c402a 100644
14+
--- a/panels/wellbeing/cc-wellbeing-panel.c
15+
+++ b/panels/wellbeing/cc-wellbeing-panel.c
16+
@@ -246,7 +246,6 @@ get_session_limits_cb (GObject *source,
17+
!g_error_matches (error, MCT_MANAGER_ERROR, MCT_MANAGER_ERROR_DISABLED))
18+
g_warning ("Error retrieving session limits: %s", error->message);
19+
20+
- update_settings_bindings (self);
21+
update_daily_time_limit_and_grayscale_row_sensitivity (self);
22+
}
23+
24+
@@ -329,27 +328,6 @@ is_parental_controls_enabled (CcWellbeingPanel *self)
25+
static void
26+
update_settings_bindings (CcWellbeingPanel *self)
27+
{
28+
-#ifdef HAVE_MALCONTENT
29+
- if (is_parental_controls_enabled (self))
30+
- {
31+
- gboolean daily_limit;
32+
- unsigned int limit_secs;
33+
-
34+
- g_settings_unbind (self->screen_time_limit_row, "active");
35+
- g_settings_unbind (self->daily_time_limit_row, "duration");
36+
- g_settings_unbind (self->grayscale_row, "active");
37+
-
38+
- g_clear_signal_handler (&self->screen_time_limits_settings_writable_changed_daily_limit_seconds_id, self->screen_time_limits_settings);
39+
-
40+
- daily_limit = mct_session_limits_get_daily_limit (self->limits, &limit_secs);
41+
-
42+
- adw_switch_row_set_active (self->screen_time_limit_row, daily_limit);
43+
- cc_duration_row_set_duration (CC_DURATION_ROW (self->daily_time_limit_row), limit_secs / 60);
44+
- adw_switch_row_set_active (self->grayscale_row, FALSE);
45+
-
46+
- return;
47+
- }
48+
-#endif
49+
g_settings_bind (self->screen_time_limits_settings,
50+
"daily-limit-enabled",
51+
self->screen_time_limit_row,

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
debian/Debian-s-adduser-doesn-t-allow-uppercase-letters-by-defau.patch
22
debian/Ignore-result-of-test-network-panel.patch
33
debian/meson:relax-malcontent-version.patch
4+
debian/Revert-wellbeing-Synchronize-settings-with-malcontent.patch
45
vanillaos/vanilla-updates-utility.patch
56
vanillaos/vanilla-prime-utility.patch

0 commit comments

Comments
 (0)