rpm/gnome-control-center
SHA256
1
0
Fork 0
forked from pool/gnome-control-center
Code Pull Requests Activity
factory
gnome-control-center/gnome-control-center-disable-error-message-for-NM.patch
Dominique Leuenberger 6b171a5378 Accepting request 1183892 from GNOME:Next 
- Update to version 46.3:
  + CI fixes
  + Mouse: Make Mouse test click indicator not respond for middle
    clicks
  + Network: Reference icon-name proper for wifi panel
  + Tests: Don't require Xvfb or setxkbmap for tests
  + Sharing: Make Orca read the "Add Folder" row in Media Sharing
    settings
  + Update translations.
- Refresh patches with quilt.

OBS-URL: https://build.opensuse.org/request/show/1183892
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=561
2024-07-01 08:58:41 +00:00

175 lines
8.1 KiB
Diff
Raw Permalink Blame History

Index: gnome-control-center-46.3/panels/network/cc-network-panel.c
===================================================================
--- gnome-control-center-46.3.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-46.3/panels/network/cc-network-panel.c
@@ -667,10 +667,24 @@ static void
panel_check_network_manager_version (CcNetworkPanel *self)
{
const gchar *version;
+ const gchar *state;
+ GDBusConnection *connection;
+ GDBusProxy *proxy;
+ GVariant *variant;
+
+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+ "org.freedesktop.systemd1.Unit",
+ NULL, NULL);
+ variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
+ state = g_variant_get_string (variant, NULL);
/* parse running version */
version = nm_client_get_version (self->client);
- if (version == NULL) {
+ if (version == NULL && g_strcmp0 (state, "inactive") == 0) {
GtkWidget *status_page;
status_page = adw_status_page_new ();
@@ -681,10 +695,23 @@ panel_check_network_manager_version (CcN
adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
_("An error has occurred and network cannot be used."
"\n Error details: NetworkManager not running."));
+ } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
+ GtkWidget *status_page;
+
+ status_page = adw_status_page_new ();
+ adw_toolbar_view_set_content (ADW_TOOLBAR_VIEW (self->toolbar_view), 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), _("Wicked is running"));
+ adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
+ _("Please use YaST2 to configure your network."));
} else {
manager_running (self);
}
+
+ g_object_unref (connection);
+ g_object_unref (proxy);
+ g_variant_unref (variant);
}
static void
Index: gnome-control-center-46.3/panels/network/cc-wifi-panel.c
===================================================================
--- gnome-control-center-46.3.orig/panels/network/cc-wifi-panel.c
+++ gnome-control-center-46.3/panels/network/cc-wifi-panel.c
@@ -298,21 +298,41 @@ static void
check_main_stack_page (CcWifiPanel *self)
{
const gchar *nm_version;
+ const gchar *state;
gboolean airplane_mode_active;
gboolean wireless_enabled;
+ GDBusConnection *connection;
+ GDBusProxy *proxy;
+ GVariant *variant;
+
+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+ "org.freedesktop.systemd1.Unit",
+ NULL, NULL);
+ variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
+ state = g_variant_get_string (variant, NULL);
nm_version = nm_client_get_version (self->client);
wireless_enabled = nm_client_wireless_get_enabled (self->client);
airplane_mode_active = adw_switch_row_get_active (self->rfkill_row);
- if (!nm_version)
+ if (!nm_version && g_strcmp0 (state, "inactive") == 0)
gtk_stack_set_visible_child_name (self->main_stack, "nm-not-running");
+ else if (!nm_version && g_strcmp0 (state, "active") == 0)
+ gtk_stack_set_visible_child_name (self->main_stack, "wicked-running");
else if (!wireless_enabled && airplane_mode_active)
gtk_stack_set_visible_child_name (self->main_stack, "airplane-mode");
else if (!wireless_enabled || self->devices->len == 0)
gtk_stack_set_visible_child_name (self->main_stack, "no-wifi-devices");
else
gtk_stack_set_visible_child_name (self->main_stack, "wifi-connections");
+
+ g_object_unref (connection);
+ g_object_unref (proxy);
+ g_variant_unref (variant);
}
static void
Index: gnome-control-center-46.3/panels/network/cc-wifi-panel.ui
===================================================================
--- gnome-control-center-46.3.orig/panels/network/cc-wifi-panel.ui
+++ gnome-control-center-46.3/panels/network/cc-wifi-panel.ui
@@ -197,6 +197,51 @@
</property>
</object>
</child>
+
+ <!-- "Wicked Running" page -->
+ <child>
+ <object class="GtkStackPage">
+ <property name="name">wicked-running</property>
+ <property name="child">
+ <object class="GtkCenterBox">
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="margin-top">18</property>
+ <property name="margin-bottom">18</property>
+ <property name="margin-start">18</property>
+ <property name="margin-end">18</property>
+ <child type="center">
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">face-sad-symbolic</property>
+ <property name="pixel_size">128</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ </object>
+ </child>
+ <child type="end">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="label" translatable="yes">Please use YaST2 to configure your network.</property>
+ <attributes>
+ <attribute name="scale" value="1.42" />
+ </attributes>
+ </object>
+ </child>
+ </object>
+ </property>
+ </object>
+ </child>
+
</object>
</child>
</object>
Index: gnome-control-center-46.3/tests/meson.build
===================================================================
--- gnome-control-center-46.3.orig/tests/meson.build
+++ gnome-control-center-46.3/tests/meson.build
@@ -3,9 +3,12 @@ Xvfb = find_program('Xvfb', required: fa
subdir('common')
#subdir('datetime')
+# Disable tests for network panel, boo#1128195
+if false
if host_is_linux
subdir('network')
endif
+endif
# FIXME: this is a workaround because interactive-tests don't work with libadwaita as a subproject. See !1754
if not libadwaita_is_subproject
View Git Blame Copy Permalink