[gnome-control-center/wip/hadess/remove-ppd-0.8-support: 2/2] power: Remove support for power-profiles-daemon < 0.9.0
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/hadess/remove-ppd-0.8-support: 2/2] power: Remove support for power-profiles-daemon < 0.9.0
- Date: Fri, 14 Jan 2022 13:46:51 +0000 (UTC)
commit bd4c27e7ab93f2fe8d4b42fc0b822582fba7d783
Author: Bastien Nocera <hadess hadess net>
Date: Fri Jan 14 12:22:33 2022 +0100
power: Remove support for power-profiles-daemon < 0.9.0
panels/power/cc-power-panel.c | 24 +-----------------
panels/power/cc-power-profile-row.c | 50 -------------------------------------
panels/power/cc-power-profile-row.h | 2 --
3 files changed, 1 insertion(+), 75 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index c8f6814a0..610deb6b8 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1103,18 +1103,6 @@ performance_profile_set_active (CcPowerPanel *self,
gtk_check_button_set_active (GTK_CHECK_BUTTON (button), TRUE);
}
-static void
-performance_profile_set_inhibited (CcPowerPanel *self,
- const char *performance_inhibited)
-{
- CcPowerProfileRow *row;
-
- row = self->power_profiles_row[CC_POWER_PROFILE_PERFORMANCE];
- if (!row)
- return;
- cc_power_profile_row_set_performance_inhibited (row, performance_inhibited);
-}
-
static void
power_profile_update_info_boxes (CcPowerPanel *self)
{
@@ -1263,13 +1251,7 @@ power_profiles_properties_changed_cb (CcPowerPanel *self,
g_variant_get (changed_properties, "a{sv}", &iter);
while (g_variant_iter_next (iter, "{&sv}", &key, &value))
{
- if (g_strcmp0 (key, "PerformanceInhibited") == 0)
- {
- if (!self->has_performance_degraded)
- performance_profile_set_inhibited (self,
- g_variant_get_string (value, NULL));
- }
- else if (g_strcmp0 (key, "PerformanceDegraded") == 0 ||
+ if (g_strcmp0 (key, "PerformanceDegraded") == 0 ||
g_strcmp0 (key, "ActiveProfileHolds") == 0)
{
power_profile_update_info_boxes (self);
@@ -1355,7 +1337,6 @@ setup_power_profiles (CcPowerPanel *self)
g_autoptr(GVariant) props = NULL;
guint i, num_children;
g_autoptr(GError) error = NULL;
- const char *performance_inhibited = NULL;
const char *performance_degraded;
const char *active_profile;
g_autoptr(GVariant) profiles = NULL;
@@ -1411,8 +1392,6 @@ setup_power_profiles (CcPowerPanel *self)
props = g_variant_get_child_value (variant, 0);
performance_degraded = variant_lookup_string (props, "PerformanceDegraded");
self->has_performance_degraded = performance_degraded != NULL;
- if (performance_degraded == NULL)
- performance_inhibited = variant_lookup_string (props, "PerformanceInhibited");
active_profile = variant_lookup_string (props, "ActiveProfile");
last_button = NULL;
@@ -1439,7 +1418,6 @@ setup_power_profiles (CcPowerPanel *self)
profile = cc_power_profile_from_str (name);
row = cc_power_profile_row_new (cc_power_profile_from_str (name));
- cc_power_profile_row_set_performance_inhibited (row, performance_inhibited);
g_signal_connect_object (G_OBJECT (row), "button-toggled",
G_CALLBACK (power_profile_button_toggled_cb), self,
0);
diff --git a/panels/power/cc-power-profile-row.c b/panels/power/cc-power-profile-row.c
index e4b149b10..dbb609fb2 100644
--- a/panels/power/cc-power-profile-row.c
+++ b/panels/power/cc-power-profile-row.c
@@ -39,7 +39,6 @@ struct _CcPowerProfileRow
GtkLabel *title_label;
CcPowerProfile power_profile;
- char *performance_inhibited;
};
G_DEFINE_TYPE (CcPowerProfileRow, cc_power_profile_row, GTK_TYPE_LIST_BOX_ROW)
@@ -51,44 +50,6 @@ enum {
static guint signals[N_SIGNALS];
-static const char *
-get_performance_inhibited_text (const char *inhibited)
-{
- if (!inhibited || *inhibited == '\0')
- return NULL;
-
- if (g_str_equal (inhibited, "lap-detected"))
- return _("Lap detected: performance mode unavailable");
- if (g_str_equal (inhibited, "high-operating-temperature"))
- return _("High hardware temperature: performance mode unavailable");
- return _("Performance mode unavailable");
-}
-
-static void
-performance_profile_set_inhibited (CcPowerProfileRow *self,
- const char *performance_inhibited)
-{
- const char *text;
- gboolean inhibited = FALSE;
-
- if (self->power_profile != CC_POWER_PROFILE_PERFORMANCE)
- return;
-
- gtk_widget_remove_css_class (GTK_WIDGET (self->subtitle_label), "dim-label");
- gtk_widget_remove_css_class (GTK_WIDGET (self->subtitle_label), "error");
-
- text = get_performance_inhibited_text (performance_inhibited);
- if (text)
- inhibited = TRUE;
- else
- text = _("High performance and power usage.");
- gtk_label_set_text (GTK_LABEL (self->subtitle_label), text);
-
- gtk_widget_add_css_class (GTK_WIDGET (self->subtitle_label),
- inhibited ? "error" : "dim-label");
- gtk_widget_set_sensitive (GTK_WIDGET (self), !inhibited);
-}
-
static void
cc_power_profile_row_button_toggled_cb (CcPowerProfileRow *self)
{
@@ -148,17 +109,6 @@ cc_power_profile_row_set_active (CcPowerProfileRow *self,
gtk_check_button_set_active (GTK_CHECK_BUTTON (self->button), active);
}
-void
-cc_power_profile_row_set_performance_inhibited (CcPowerProfileRow *self,
- const char *performance_inhibited)
-{
- g_return_if_fail (CC_IS_POWER_PROFILE_ROW (self));
-
- g_clear_pointer (&self->performance_inhibited, g_free);
- self->performance_inhibited = g_strdup (performance_inhibited);
- performance_profile_set_inhibited (self, self->performance_inhibited);
-}
-
gboolean
cc_power_profile_row_get_active (CcPowerProfileRow *self)
{
diff --git a/panels/power/cc-power-profile-row.h b/panels/power/cc-power-profile-row.h
index 6a26c44af..a6406e9f2 100644
--- a/panels/power/cc-power-profile-row.h
+++ b/panels/power/cc-power-profile-row.h
@@ -44,8 +44,6 @@ CcPowerProfile cc_power_profile_row_get_profile (CcPowerProfileRow *row);
GtkCheckButton *cc_power_profile_row_get_radio_button (CcPowerProfileRow *row);
void cc_power_profile_row_set_active (CcPowerProfileRow *row, gboolean active);
gboolean cc_power_profile_row_get_active (CcPowerProfileRow *row);
-void cc_power_profile_row_set_performance_inhibited (CcPowerProfileRow *row,
- const char *performance_inhibited);
CcPowerProfile cc_power_profile_from_str (const char *profile);
const char *cc_power_profile_to_str (CcPowerProfile profile);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]