Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Factory:PowerPC:Rings:1-MinimalX
gnome-control-center
gnome-control-center-disable-error-message-for-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gnome-control-center-disable-error-message-for-NM.patch of Package gnome-control-center
diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-network-panel.c gnome-control-center-45.1/panels/network/cc-network-panel.c --- temp/gnome-control-center-45.1/panels/network/cc-network-panel.c 2023-10-27 14:56:16.289319792 +0800 +++ gnome-control-center-45.1/panels/network/cc-network-panel.c 2023-10-27 15:42:47.030395835 +0800 @@ -653,10 +653,24 @@ 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 (); @@ -667,10 +681,23 @@ 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_navigation_page_set_child (ADW_NAVIGATION_PAGE (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), _("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 diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.c gnome-control-center-45.1/panels/network/cc-wifi-panel.c --- temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.c 2023-10-27 14:56:16.292653165 +0800 +++ gnome-control-center-45.1/panels/network/cc-wifi-panel.c 2023-10-27 15:05:30.805703042 +0800 @@ -298,21 +298,41 @@ 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 diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.ui gnome-control-center-45.1/panels/network/cc-wifi-panel.ui --- temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.ui 2023-10-27 14:56:16.292653165 +0800 +++ gnome-control-center-45.1/panels/network/cc-wifi-panel.ui 2023-10-27 14:49:00.914031545 +0800 @@ -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> diff -uraBN temp/gnome-control-center-45.1/tests/meson.build gnome-control-center-45.1/tests/meson.build --- temp/gnome-control-center-45.1/tests/meson.build 2023-10-27 14:56:16.545989479 +0800 +++ gnome-control-center-45.1/tests/meson.build 2023-10-27 14:49:56.034724339 +0800 @@ -1,8 +1,11 @@ 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
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
