diff --git a/SOURCES/subscription-manager-support.patch b/SOURCES/subscription-manager-support.patch index 7af3186..3218dbf 100644 --- a/SOURCES/subscription-manager-support.patch +++ b/SOURCES/subscription-manager-support.patch @@ -69,15 +69,17 @@ index b20e5c1f7..99c8b20d7 100644 + gtk_widget_hide (GTK_WIDGET (self->subscription_row)); + return; + } -+ + if (!get_subscription_status (self->subscription_proxy, &status)) + { + gtk_widget_hide (GTK_WIDGET (self->subscription_row)); + return; + } -+ + switch (status) + { ++ case GSD_SUBMAN_SUBSCRIPTION_STATUS_NOT_READ: ++ gtk_widget_hide (GTK_WIDGET (self->subscription_row)); ++ gtk_widget_set_sensitive (GTK_WIDGET (self->software_updates_row), FALSE); ++ return; + case GSD_SUBMAN_SUBSCRIPTION_STATUS_UNKNOWN: + registered = FALSE; + updates = FALSE; @@ -106,9 +108,7 @@ index b20e5c1f7..99c8b20d7 100644 + break; + default: + g_assert_not_reached (); -+ break; + } -+ + if (registered) + { + if (updates) @@ -311,6 +311,7 @@ index 000000000..034d64181 +#define CC_SUBSCRIPTION_COMMON_H + +typedef enum { ++ GSD_SUBMAN_SUBSCRIPTION_STATUS_NOT_READ = -1, + GSD_SUBMAN_SUBSCRIPTION_STATUS_UNKNOWN, + GSD_SUBMAN_SUBSCRIPTION_STATUS_VALID, + GSD_SUBMAN_SUBSCRIPTION_STATUS_INVALID, @@ -339,7 +340,6 @@ index 000000000..034d64181 + + return TRUE; +} -+ +#endif diff --git a/panels/info-overview/cc-subscription-details-dialog.c b/panels/info-overview/cc-subscription-details-dialog.c new file mode 100644 @@ -641,6 +641,7 @@ index 000000000..15da1d911 + break; + + case GSD_SUBMAN_SUBSCRIPTION_STATUS_DISABLED: ++ case GSD_SUBMAN_SUBSCRIPTION_STATUS_NOT_READ: + gtk_stack_set_visible_child_name (self->status_stack, "subscription-not-needed"); + gtk_widget_hide (GTK_WIDGET (self->subscribe_button)); + break; @@ -654,7 +655,6 @@ index 000000000..15da1d911 + + gtk_widget_set_visible (GTK_WIDGET (self->separator), + gtk_widget_get_visible (GTK_WIDGET (self->subscribe_button))); -+ +} + +static ProductData * diff --git a/SPECS/gnome-control-center.spec b/SPECS/gnome-control-center.spec index 4a89fa5..9b57561 100644 --- a/SPECS/gnome-control-center.spec +++ b/SPECS/gnome-control-center.spec @@ -14,7 +14,7 @@ Name: gnome-control-center Version: 40.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA @@ -242,6 +242,11 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center %dir %{_datadir}/gnome/wm-properties %changelog +* Tue Jan 09 2024 Ray Strode - 40.0-30 +- Handle subscription manager service not running without + crashing + Related: RHEL-20449 + * Fri Feb 10 2023 Felipe Borges - 40.0-29 - Fix keyboard accessibility of screen resolution list Resolves: rhbz#2168686