forked from pool/gnome-control-center
Dominique Leuenberger
963122a8d2
- Rebase gnome-control-center-disable-error-message-for-NM.patch. - Add gnome-control-center-network-use-AdwStatusPage.patch: network-panel: Use AdwStatusPage to show NetworkManager error. This is needed by the above rebased patch (glgo#GNOME/gnome-control-center/commit/2b3de01124). OBS-URL: https://build.opensuse.org/request/show/1040635 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=493
59 lines
2.8 KiB
Diff
59 lines
2.8 KiB
Diff
From 2b3de0112438c45372f872d0fd967ad2d907af6e Mon Sep 17 00:00:00 2001
|
||
From: Mohammed Sadiq <sadiq@sadiqpk.org>
|
||
Date: Tue, 1 Nov 2022 17:41:39 +0530
|
||
Subject: [PATCH] network-panel: Use AdwStatusPage to show NetworkManager error
|
||
|
||
This commit also fixes missing header bar when the error is shown
|
||
---
|
||
panels/network/cc-network-panel.c | 34 ++++++++++---------------------
|
||
1 file changed, 11 insertions(+), 23 deletions(-)
|
||
|
||
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
|
||
index e80fd4a4e..24a6c6f8b 100644
|
||
--- a/panels/network/cc-network-panel.c
|
||
+++ b/panels/network/cc-network-panel.c
|
||
@@ -658,29 +658,17 @@ panel_check_network_manager_version (CcNetworkPanel *self)
|
||
/* parse running version */
|
||
version = nm_client_get_version (self->client);
|
||
if (version == NULL) {
|
||
- GtkWidget *box;
|
||
- GtkWidget *label;
|
||
- g_autofree gchar *markup = NULL;
|
||
-
|
||
- box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
|
||
- gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
|
||
- gtk_widget_set_vexpand (box, TRUE);
|
||
- adw_bin_set_child (ADW_BIN (self), box);
|
||
-
|
||
- label = gtk_label_new (_("Oops, something has gone wrong. Please contact your software vendor."));
|
||
- gtk_widget_set_vexpand (label, TRUE);
|
||
- gtk_label_set_wrap (GTK_LABEL (label), TRUE);
|
||
- gtk_widget_set_valign (label, GTK_ALIGN_END);
|
||
- gtk_box_append (GTK_BOX (box), label);
|
||
-
|
||
- markup = g_strdup_printf ("<small><tt>%s</tt></small>",
|
||
- _("NetworkManager needs to be running."));
|
||
- label = gtk_label_new (NULL);
|
||
- gtk_widget_set_vexpand (label, TRUE);
|
||
- gtk_label_set_markup (GTK_LABEL (label), markup);
|
||
- gtk_label_set_wrap (GTK_LABEL (label), TRUE);
|
||
- gtk_widget_set_valign (label, GTK_ALIGN_START);
|
||
- gtk_box_append (GTK_BOX (box), label);
|
||
+ GtkWidget *status_page;
|
||
+
|
||
+ status_page = adw_status_page_new ();
|
||
+ cc_panel_set_content (CC_PANEL (self), status_page);
|
||
+
|
||
+ adw_status_page_set_icon_name (ADW_STATUS_PAGE (status_page), "network-error-symbolic");
|
||
+ adw_status_page_set_title (ADW_STATUS_PAGE (status_page), _("Can’t Connect to Network"));
|
||
+ adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
|
||
+ _("NetworkManager needs to be running to view or make "
|
||
+ "connections. Contact a system administrator or the "
|
||
+ "software vendor."));
|
||
} else {
|
||
manager_running (self);
|
||
}
|
||
--
|
||
2.38.1
|
||
|