rpms/gnome-control-center
5
0
Fork 0
Code Issues Pull Requests Releases Activity

import gnome-control-center-3.28.2-22.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-09-05 18:31:28 +00:00 committed by Andrew Lukoshko
commit 76904ab0bb
27 changed files with 11222 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
SOURCES/gnome-control-center-3.28.2.tar.xz

1
.gnome-control-center.metadata Normal file
View File

@ -0,0 +1 @@
68f77d7fd2921025a65d0b0904e6db018ca7c1d0 SOURCES/gnome-control-center-3.28.2.tar.xz

75
SOURCES/0001-common-fix-udev-based-device-removal.patch Normal file
View File

@ -0,0 +1,75 @@
From 6b34f996699a80c249d2cccfe369b3b61e70d4ce Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 10 Dec 2018 14:43:30 +1000
Subject: [PATCH] common: fix udev-based device removal
libgudev allocs a new GUdevDevice object for each event, so the pointer value
for the 'add' udev event differs from the one for the 'remove' event. If we
use the pointer value as hash table key, we'll never remove the device.
Switch to use the syspath of the device instead, that one is unique per
device.
Fixes #309
---
panels/common/gsd-device-manager-udev.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/panels/common/gsd-device-manager-udev.c b/panels/common/gsd-device-manager-udev.c
index aa9304232..105c8e987 100644
--- a/panels/common/gsd-device-manager-udev.c
+++ b/panels/common/gsd-device-manager-udev.c
@@ -122,6 +122,7 @@ add_device (GsdUdevDeviceManager *manager,
{
GUdevDevice *parent;
GsdDevice *device;
+ gchar *syspath;
parent = g_udev_device_get_parent (udev_device);
@@ -129,7 +130,8 @@ add_device (GsdUdevDeviceManager *manager,
return;
device = create_device (udev_device);
- g_hash_table_insert (manager->devices, g_object_ref (udev_device), device);
+ syspath = g_strdup (g_udev_device_get_sysfs_path (udev_device));
+ g_hash_table_insert (manager->devices, syspath, device);
g_signal_emit_by_name (manager, "device-added", device);
}
@@ -138,17 +140,19 @@ remove_device (GsdUdevDeviceManager *manager,
GUdevDevice *udev_device)
{
GsdDevice *device;
+ gchar *syspath;
- device = g_hash_table_lookup (manager->devices, udev_device);
+ syspath = g_strdup (g_udev_device_get_sysfs_path (udev_device));
+ device = g_hash_table_lookup (manager->devices, syspath);
if (!device)
return;
- g_hash_table_steal (manager->devices, udev_device);
+ g_hash_table_steal (manager->devices, syspath);
g_signal_emit_by_name (manager, "device-removed", device);
g_object_unref (device);
- g_object_unref (udev_device);
+ g_free (syspath);
}
static void
@@ -173,8 +177,8 @@ gsd_udev_device_manager_init (GsdUdevDeviceManager *manager)
const gchar *subsystems[] = { "input", NULL };
GList *devices, *l;
- manager->devices = g_hash_table_new_full (NULL, NULL,
- (GDestroyNotify) g_object_unref,
+ manager->devices = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
manager->udev_client = g_udev_client_new (subsystems);
--
2.24.0

2258
SOURCES/0001-info-Add-subscription-manager-integration.patch Normal file
View File

File diff suppressed because it is too large Load Diff

46
SOURCES/0001-network-Keep-a-ref-on-NetDeviceEthernet-while-a-edit.patch Normal file
View File

@ -0,0 +1,46 @@
From 711afc3a83ba32b62ea813bb5bd79fb96207ef61 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 28 Nov 2019 16:38:03 +0100
Subject: [PATCH] network: Keep a ref on NetDeviceEthernet while a edition
dialog is open
Otherwise, invoking other panel (eg. through shell search, or CLI) and
closing the dialog will result in a crash, as the NetDeviceEthernet
object does no longer exist.
---
panels/network/net-device-ethernet.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c
index a03fa8de3..b035ce81c 100644
--- a/panels/network/net-device-ethernet.c
+++ b/panels/network/net-device-ethernet.c
@@ -233,6 +233,7 @@ editor_done (NetConnectionEditor *editor,
{
g_object_unref (editor);
device_ethernet_refresh_ui (device);
+ g_object_unref (device);
}
static void
@@ -255,7 +256,7 @@ show_details (GtkButton *button, NetDeviceEthernet *device, const gchar *title)
editor = net_connection_editor_new (GTK_WINDOW (window), connection, nmdev, NULL, client);
if (title)
net_connection_editor_set_title (editor, title);
- g_signal_connect (editor, "done", G_CALLBACK (editor_done), device);
+ g_signal_connect (editor, "done", G_CALLBACK (editor_done), g_object_ref (device));
net_connection_editor_run (editor);
}
@@ -455,7 +456,7 @@ add_profile (GtkButton *button, NetDeviceEthernet *device)
nmdev = net_device_get_nm_device (NET_DEVICE (device));
editor = net_connection_editor_new (GTK_WINDOW (window), connection, nmdev, NULL, client);
- g_signal_connect (editor, "done", G_CALLBACK (editor_done), device);
+ g_signal_connect (editor, "done", G_CALLBACK (editor_done), g_object_ref (device));
net_connection_editor_run (editor);
}
--
2.24.0

72
SOURCES/0001-network-Make-IPv4-v6-pages-drive-the-scrolledwindow-.patch Normal file
View File

@ -0,0 +1,72 @@
From 0f7a591fa691bc826cee19ae01a6338145119aee Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 12 Dec 2019 16:20:57 +0100
Subject: [PATCH] network: Make IPv4/v6 pages drive the scrolledwindow
adjustments
Those 2 pages in the connection editor dialog are scrollable, but don't
hook focus changes so they drive the adjustments. Make them do so.
---
panels/network/connection-editor/ce-page-ip4.c | 3 +++
panels/network/connection-editor/ce-page-ip6.c | 3 +++
panels/network/connection-editor/ip4-page.ui | 2 +-
panels/network/connection-editor/ip6-page.ui | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index 400dc433d..d79e9a3dd 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -515,6 +515,9 @@ connect_ip4_page (CEPageIP4 *page)
gboolean disabled;
guint method, i;
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (gtk_builder_get_object (CE_PAGE (page)->builder, "main_box")),
+ gtk_scrolled_window_get_vadjustment (gtk_builder_get_object (CE_PAGE (page)->builder, "page")));
+
add_address_section (page);
add_dns_section (page);
add_routes_section (page);
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index 995197504..f7105cc5b 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -485,6 +485,9 @@ connect_ip6_page (CEPageIP6 *page)
gboolean disabled;
guint method, i;
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (gtk_builder_get_object (CE_PAGE (page)->builder, "main_box")),
+ gtk_scrolled_window_get_vadjustment (gtk_builder_get_object (CE_PAGE (page)->builder, "page")));
+
add_address_section (page);
add_dns_section (page);
add_routes_section (page);
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index fe5d407c9..597987d57 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -10,7 +10,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">24</property>
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index 6d39bd0ec..5164b1004 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -10,7 +10,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">24</property>
--
2.23.0

27
SOURCES/0001-network-Make-list-in-new-VPN-dialog-fill-up-space.patch Normal file
View File

@ -0,0 +1,27 @@
From 5e0840c52fc5a3e2334ef3a50aa15e320f2f074e Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 29 Nov 2019 20:45:32 +0100
Subject: [PATCH] network: Make list in "new VPN" dialog fill up space
If we don't have much content on it (Due to lack of VPN NM modules),
the list will look oddly centered. Have it fill the available space.
---
panels/network/connection-editor/connection-editor.ui | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/network/connection-editor/connection-editor.ui b/panels/network/connection-editor/connection-editor.ui
index 4495c728d..9214b6463 100644
--- a/panels/network/connection-editor/connection-editor.ui
+++ b/panels/network/connection-editor/connection-editor.ui
@@ -93,7 +93,7 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
--
2.24.0

63
SOURCES/0001-network-Update-VPN-empty-label-status-after-removing.patch Normal file
View File

@ -0,0 +1,63 @@
From 3f089ddbd8cc304c563b4ed8cfbc59d27ffadc00 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 12 Dec 2019 22:43:15 +0100
Subject: [PATCH] network: Update VPN empty label status after removing VPN
connection
Being the VPN list actually a collection of listboxes, this function
ensures it looks alright in other places. However the case of removing
all VPN connections till we're back empty was missed.
---
panels/network/cc-network-panel.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 1a072a65a..f08d9b939 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -761,6 +761,33 @@ notify_connection_added_cb (NMClient *client,
add_connection (panel, NM_CONNECTION (connection));
}
+static void
+notify_connection_removed_cb (NMClient *client,
+ NMRemoteConnection *connection,
+ CcNetworkPanel *panel)
+{
+ guint i;
+
+ for (i = 0; i < panel->devices->len; i++) {
+ NetObject *object = g_ptr_array_index (panel->devices, i);
+ NMConnection *vpn_conn;
+ gboolean equal;
+
+ if (!NET_IS_VPN (object))
+ continue;
+
+ g_object_get (object, "connection", &vpn_conn, NULL);
+ equal = vpn_conn == NM_CONNECTION (connection);
+ g_object_unref (vpn_conn);
+
+ if (equal) {
+ g_ptr_array_remove (panel->devices, object);
+ update_vpn_section (panel);
+ return;
+ }
+ }
+}
+
static void
panel_check_network_manager_version (CcNetworkPanel *panel)
{
@@ -912,6 +939,8 @@ cc_network_panel_init (CcNetworkPanel *panel)
/* add remote settings such as VPN settings as virtual devices */
g_signal_connect (panel->client, NM_CLIENT_CONNECTION_ADDED,
G_CALLBACK (notify_connection_added_cb), panel);
+ g_signal_connect (panel->client, NM_CLIENT_CONNECTION_REMOVED,
+ G_CALLBACK (notify_connection_removed_cb), panel);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (panel));
g_signal_connect_after (toplevel, "map", G_CALLBACK (on_toplevel_map), panel);
--
2.23.0

40
SOURCES/0001-network-Use-connect-object-on-signals.patch Normal file
View File

@ -0,0 +1,40 @@
From 3f7c47e70915bb085d956d0b3c36d36e4c0da05b Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 16 Dec 2019 14:06:43 +0100
Subject: [PATCH] network: Use connect object on signals
This ensures the signals are disconnected on panel finalization.
---
panels/network/cc-network-panel.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 1a072a65a..deb4b967e 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -881,14 +881,14 @@ cc_network_panel_init (CcNetworkPanel *panel)
/* use NetworkManager client */
panel->client = nm_client_new (NULL, NULL);
- g_signal_connect (panel->client, "notify::nm-running" ,
- G_CALLBACK (manager_running), panel);
- g_signal_connect (panel->client, "notify::active-connections",
- G_CALLBACK (active_connections_changed), panel);
- g_signal_connect (panel->client, "device-added",
- G_CALLBACK (device_added_cb), panel);
- g_signal_connect (panel->client, "device-removed",
- G_CALLBACK (device_removed_cb), panel);
+ g_signal_connect_object (panel->client, "notify::nm-running" ,
+ G_CALLBACK (manager_running), panel, 0);
+ g_signal_connect_object (panel->client, "notify::active-connections",
+ G_CALLBACK (active_connections_changed), panel, 0);
+ g_signal_connect_object (panel->client, "device-added",
+ G_CALLBACK (device_added_cb), panel, 0);
+ g_signal_connect_object (panel->client, "device-removed",
+ G_CALLBACK (device_removed_cb), panel, 0);
/* Setup ModemManager client */
system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
--
2.24.0

55
SOURCES/0001-network-Use-g_signal_connect_object-when-dealing-wit.patch Normal file
View File

@ -0,0 +1,55 @@
From 06b1f439c05a20b790cebb850d8ba514249583c4 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 3 Dec 2019 16:56:59 +0100
Subject: [PATCH] network: Use g_signal_connect_object() when dealing with
NMClient
We may get signal emissions and property changes during NMClient
destruction, triggered from CcWifiPanel destruction. This triggers
callbacks that were not meant to trigger on panel destruction.
---
panels/network/cc-wifi-panel.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index 2c1cd17b7..7dd182e59 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -621,20 +621,20 @@ cc_wifi_panel_init (CcWifiPanel *self)
/* Load NetworkManager */
self->client = nm_client_new (NULL, NULL);
- g_signal_connect (self->client,
- "device-added",
- G_CALLBACK (device_added_cb),
- self);
-
- g_signal_connect (self->client,
- "device-removed",
- G_CALLBACK (device_removed_cb),
- self);
-
- g_signal_connect (self->client,
- "notify::wireless-enabled",
- G_CALLBACK (wireless_enabled_cb),
- self);
+ g_signal_connect_object (self->client,
+ "device-added",
+ G_CALLBACK (device_added_cb),
+ self, 0);
+
+ g_signal_connect_object (self->client,
+ "device-removed",
+ G_CALLBACK (device_removed_cb),
+ self, 0);
+
+ g_signal_connect_object (self->client,
+ "notify::wireless-enabled",
+ G_CALLBACK (wireless_enabled_cb),
+ self, 0);
/* Load Wi-Fi devices */
load_wifi_devices (self);
--
2.24.0

25
SOURCES/0001-power-correct-the-value-of-90-minutes-to-5400.patch Normal file
View File

@ -0,0 +1,25 @@
From 7b3c55a3e6c53a54a140c59c8a18d9b18e1cc4e5 Mon Sep 17 00:00:00 2001
From: Ethan Hsieh <ethan.hsieh@canonical.com>
Date: Thu, 2 May 2019 13:28:09 +0800
Subject: [PATCH] power: correct the value of 90 minutes to 5400
---
panels/power/power.ui | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/power/power.ui b/panels/power/power.ui
index 2c113b238..60fdc10dc 100644
--- a/panels/power/power.ui
+++ b/panels/power/power.ui
@@ -39,7 +39,7 @@
</row>
<row>
<col id="0" translatable="yes">90 minutes</col>
- <col id="1">4800</col>
+ <col id="1">5400</col>
</row>
<row>
<col id="0" translatable="yes">100 minutes</col>
--
2.24.0

383
SOURCES/0001-sharing-Enable-settings-widget-for-gnome-remote-desk.patch Normal file
View File

@ -0,0 +1,383 @@
From f135d985e80c85e1578cd60eeb79bd974788031f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 14 Feb 2018 20:52:37 +0800
Subject: [PATCH] sharing: Enable settings widget for gnome-remote-desktop
Enable support for manipulating GNOME Remote Desktop settings. Settings
are done via the org.gnome.desktop.remote-desktop.vnc schema.
Configuring the VNC password is done via libsecret, thus libsecret is
added as a dependency.
---
meson.build | 1 +
panels/sharing/cc-gnome-remote-desktop.c | 171 +++++++++++++++++++++++
panels/sharing/cc-gnome-remote-desktop.h | 49 +++++++
panels/sharing/cc-sharing-panel.c | 62 +++++++-
panels/sharing/meson.build | 3 +-
5 files changed, 282 insertions(+), 4 deletions(-)
create mode 100644 panels/sharing/cc-gnome-remote-desktop.c
create mode 100644 panels/sharing/cc-gnome-remote-desktop.h
diff --git a/meson.build b/meson.build
index 84e04334c..3017b180a 100644
--- a/meson.build
+++ b/meson.build
@@ -109,6 +109,7 @@ pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_ver
upower_glib_dep = dependency('upower-glib', version: '>= 0.99.6')
x11_dep = dependency('x11')
xi_dep = dependency('xi', version: '>= 1.2')
+libsecret_dep = dependency('libsecret-1')
m_dep = cc.find_library('m')
diff --git a/panels/sharing/cc-gnome-remote-desktop.c b/panels/sharing/cc-gnome-remote-desktop.c
new file mode 100644
index 000000000..8420fddca
--- /dev/null
+++ b/panels/sharing/cc-gnome-remote-desktop.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include "config.h"
+
+#include "cc-gnome-remote-desktop.h"
+
+const SecretSchema *
+cc_grd_vnc_password_get_schema (void)
+{
+ static const SecretSchema grd_vnc_password_schema = {
+ .name = "org.gnome.RemoteDesktop.VncPassword",
+ .flags = SECRET_SCHEMA_NONE,
+ .attributes = {
+ { "password", SECRET_SCHEMA_ATTRIBUTE_STRING },
+ { "NULL", 0 },
+ },
+ };
+
+ return &grd_vnc_password_schema;
+}
+
+gboolean
+cc_grd_get_is_auth_method_prompt (GValue *value,
+ GVariant *variant,
+ gpointer user_data)
+{
+ const char * auth_method;
+
+ auth_method = g_variant_get_string (variant, NULL);
+
+ if (g_strcmp0 (auth_method, "prompt") == 0)
+ {
+ g_value_set_boolean (value, TRUE);
+ }
+ else if (g_strcmp0 (auth_method, "password") == 0)
+ {
+ g_value_set_boolean (value, FALSE);
+ }
+ else
+ {
+ g_warning ("Unhandled VNC auth method %s", auth_method);
+ g_value_set_boolean (value, FALSE);
+ }
+
+ return TRUE;
+}
+
+GVariant *
+cc_grd_set_is_auth_method_prompt (const GValue *value,
+ const GVariantType *type,
+ gpointer user_data)
+{
+ char *auth_method;
+
+ if (g_value_get_boolean (value))
+ auth_method = "prompt";
+ else
+ auth_method = "password";
+
+ return g_variant_new_string (auth_method);
+}
+
+gboolean
+cc_grd_get_is_auth_method_password (GValue *value,
+ GVariant *variant,
+ gpointer user_data)
+{
+ const char *auth_method;
+
+ auth_method = g_variant_get_string (variant, NULL);
+
+ if (g_strcmp0 (auth_method, "prompt") == 0)
+ {
+ g_value_set_boolean (value, FALSE);
+ }
+ else if (g_strcmp0 (auth_method, "password") == 0)
+ {
+ g_value_set_boolean (value, TRUE);
+ }
+ else
+ {
+ g_warning ("Unhandled VNC auth method %s", auth_method);
+ g_value_set_boolean (value, FALSE);
+ }
+
+ return TRUE;
+}
+
+GVariant *
+cc_grd_set_is_auth_method_password (const GValue *value,
+ const GVariantType *type,
+ gpointer user_data)
+{
+ char *auth_method;
+
+ if (g_value_get_boolean (value))
+ auth_method = "password";
+ else
+ auth_method = "prompt";
+
+ return g_variant_new_string (auth_method);
+}
+
+static void
+on_password_stored (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ GtkEntry *entry = GTK_ENTRY (user_data);
+ GError *error = NULL;
+
+ if (!secret_password_store_finish (result, &error))
+ {
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ {
+ g_warning ("Failed to store VNC password: %s", error->message);
+ g_object_set_data (G_OBJECT (entry),
+ "vnc-password-cancellable", NULL);
+ }
+ g_error_free (error);
+ }
+ else
+ {
+ g_object_set_data (G_OBJECT (entry),
+ "vnc-password-cancellable", NULL);
+ }
+}
+
+void
+cc_grd_on_vnc_password_entry_notify_text (GtkEntry *entry,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GCancellable *cancellable;
+ const char *password;
+
+ cancellable = g_object_get_data (G_OBJECT (entry), "vnc-password-cancellable");
+ if (cancellable)
+ g_cancellable_cancel (cancellable);
+
+ cancellable = g_cancellable_new ();
+ g_object_set_data_full (G_OBJECT (entry),
+ "vnc-password-cancellable",
+ cancellable, g_object_unref);
+
+ password = gtk_entry_get_text (entry);
+
+ secret_password_store (CC_GRD_VNC_PASSWORD_SCHEMA,
+ SECRET_COLLECTION_DEFAULT,
+ "GNOME Remote Desktop VNC password",
+ password,
+ cancellable, on_password_stored, entry,
+ NULL);
+}
diff --git a/panels/sharing/cc-gnome-remote-desktop.h b/panels/sharing/cc-gnome-remote-desktop.h
new file mode 100644
index 000000000..2a4819986
--- /dev/null
+++ b/panels/sharing/cc-gnome-remote-desktop.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef CC_GNOME_REMOTE_DESKTOP_H
+#define CC_GNOME_REMOTE_DESKTOP_H
+
+#include <gtk/gtk.h>
+#include <libsecret/secret.h>
+
+const SecretSchema * cc_grd_vnc_password_get_schema (void);
+#define CC_GRD_VNC_PASSWORD_SCHEMA cc_grd_vnc_password_get_schema ()
+
+gboolean cc_grd_get_is_auth_method_prompt (GValue *value,
+ GVariant *variant,
+ gpointer user_data);
+
+GVariant * cc_grd_set_is_auth_method_prompt (const GValue *value,
+ const GVariantType *type,
+ gpointer user_data);
+
+gboolean cc_grd_get_is_auth_method_password (GValue *value,
+ GVariant *variant,
+ gpointer user_data);
+
+GVariant * cc_grd_set_is_auth_method_password (const GValue *value,
+ const GVariantType *type,
+ gpointer user_data);
+
+void cc_grd_on_vnc_password_entry_notify_text (GtkEntry *entry,
+ GParamSpec *pspec,
+ gpointer user_data);
+
+#endif /* CC_GNOME_REMOTE_DESKTOP_H */
diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
index 8b35c9a31..adcbcdc86 100644
--- a/panels/sharing/cc-sharing-panel.c
+++ b/panels/sharing/cc-sharing-panel.c
@@ -30,6 +30,7 @@
#include "cc-media-sharing.h"
#include "cc-sharing-networks.h"
#include "cc-sharing-switch.h"
+#include "cc-gnome-remote-desktop.h"
#include "org.gnome.SettingsDaemon.Sharing.h"
#ifdef GDK_WINDOWING_WAYLAND
@@ -66,6 +67,13 @@ _gtk_builder_get_widget (GtkBuilder *builder,
#define VINO_SCHEMA_ID "org.gnome.Vino"
#define FILE_SHARING_SCHEMA_ID "org.gnome.desktop.file-sharing"
#define GNOME_REMOTE_DESKTOP_SCHEMA_ID "org.gnome.desktop.remote-desktop"
+#define GNOME_REMOTE_DESKTOP_VNC_SCHEMA_ID "org.gnome.desktop.remote-desktop.vnc"
+
+typedef enum
+{
+ GRD_VNC_AUTH_METHOD_PROMPT,
+ GRD_VNC_AUTH_METHOD_PASSWORD
+} GrdVncAuthMethod;
struct _CcSharingPanelPrivate
{
@@ -1077,11 +1085,56 @@ static void
cc_sharing_panel_setup_screen_sharing_dialog_gnome_remote_desktop (CcSharingPanel *self)
{
CcSharingPanelPrivate *priv = self->priv;
- GtkWidget *networks, *w;
+ GSettings *vnc_settings;
+ GtkWidget *networks, *box, *w;
+
+ cc_sharing_panel_bind_switch_to_widgets (WID ("require-password-radiobutton"),
+ WID ("password-grid"),
+ NULL);
+
+ cc_sharing_panel_setup_label_with_hostname (self,
+ WID ("screen-sharing-label"));
+
+ g_object_bind_property (WID ("show-password-checkbutton"), "active",
+ WID ("remote-control-password-entry"), "visibility",
+ G_BINDING_SYNC_CREATE);
+
+ /* make sure the password entry is hidden by default */
+ g_signal_connect (priv->screen_sharing_dialog, "show",
+ G_CALLBACK (screen_sharing_show_cb), self);
+
+ g_signal_connect (priv->screen_sharing_dialog, "hide",
+ G_CALLBACK (screen_sharing_hide_cb), self);
+
+ /* accept at most 8 bytes in password entry */
+ g_signal_connect (WID ("remote-control-password-entry"), "insert-text",
+ G_CALLBACK (screen_sharing_password_insert_text_cb), self);
+
+ /* Bind settings to widgets */
+ vnc_settings = g_settings_new (GNOME_REMOTE_DESKTOP_VNC_SCHEMA_ID);
+ g_settings_bind (vnc_settings, "view-only",
+ WID ("remote-control-checkbutton"), "active",
+ G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
+ g_settings_bind_with_mapping (vnc_settings, "auth-method",
+ WID ("approve-connections-radiobutton"), "active",
+ G_SETTINGS_BIND_DEFAULT,
+ cc_grd_get_is_auth_method_prompt,
+ cc_grd_set_is_auth_method_prompt,
+ NULL, NULL);
+ g_settings_bind_with_mapping (vnc_settings, "auth-method",
+ WID ("require-password-radiobutton"), "active",
+ G_SETTINGS_BIND_DEFAULT,
+ cc_grd_get_is_auth_method_password,
+ cc_grd_set_is_auth_method_password,
+ NULL, NULL);
+ g_signal_connect (WID ("remote-control-password-entry"),
+ "notify::text",
+ G_CALLBACK (cc_grd_on_vnc_password_entry_notify_text),
+ self);
networks = cc_sharing_networks_new (self->priv->sharing_proxy, "gnome-remote-desktop");
- gtk_widget_hide (WID ("remote-control-box"));
- gtk_grid_attach (GTK_GRID (WID ("grid3")), networks, 0, 1, 2, 1);
+ box = WID ("remote-control-box");
+ gtk_box_pack_end (GTK_BOX (box), networks, TRUE, TRUE, 0);
gtk_widget_show (networks);
w = cc_sharing_switch_new (networks);
@@ -1116,6 +1169,9 @@ check_remote_desktop_available (CcSharingPanel *self)
if (!cc_sharing_panel_check_schema_available (self, GNOME_REMOTE_DESKTOP_SCHEMA_ID))
return;
+ if (!cc_sharing_panel_check_schema_available (self, GNOME_REMOTE_DESKTOP_VNC_SCHEMA_ID))
+ return;
+
priv->remote_desktop_name_watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
"org.gnome.Mutter.RemoteDesktop",
G_BUS_NAME_WATCHER_FLAGS_NONE,
diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build
index 5caac36c0..1565a089a 100644
--- a/panels/sharing/meson.build
+++ b/panels/sharing/meson.build
@@ -43,6 +43,7 @@ sources = files(
'cc-remote-login.c',
'cc-sharing-networks.c',
'cc-sharing-switch.c',
+ 'cc-gnome-remote-desktop.c',
'file-share-properties.c',
'vino-preferences.c'
)
@@ -79,7 +80,7 @@ panels_libs += static_library(
cappletname,
sources: sources,
include_directories: top_inc,
- dependencies: common_deps,
+ dependencies: [common_deps, libsecret_dep],
c_args: cflags
)
--
2.17.1

30
SOURCES/0001-sharing-Fix-warning-when-disabling-sharing.patch Normal file
View File

@ -0,0 +1,30 @@
From 5502611f0cfe7083c2b2a650385ea4554cb73ac9 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Mon, 15 Oct 2018 11:49:19 +1300
Subject: [PATCH 3/4] sharing: Fix warning when disabling sharing
The warning is:
(gnome-control-center:29760): Gtk-CRITICAL **: 11:45:48.076: gtk_widget_is_visible: assertion 'GTK_IS_WIDGET (widget)' failed
This is due to the code trying to disable switches that only exist if support
for that feature is available.
---
panels/sharing/cc-sharing-panel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
index 8b35c9a31..98f2d69ef 100644
--- a/panels/sharing/cc-sharing-panel.c
+++ b/panels/sharing/cc-sharing-panel.c
@@ -91,7 +91,7 @@ struct _CcSharingPanelPrivate
guint remote_desktop_name_watch;
};
-#define OFF_IF_VISIBLE(x) { if (gtk_widget_is_visible(x) && gtk_widget_is_sensitive(x)) gtk_switch_set_active (GTK_SWITCH(x), FALSE); }
+#define OFF_IF_VISIBLE(x) { if ((x) != NULL && gtk_widget_is_visible(x) && gtk_widget_is_sensitive(x)) gtk_switch_set_active (GTK_SWITCH(x), FALSE); }
static void
cc_sharing_panel_master_switch_notify (GtkSwitch *gtkswitch,
--
2.24.0

66
SOURCES/0001-sharing-Remember-the-password-on-remote-desktop-shar.patch Normal file
View File

@ -0,0 +1,66 @@
From 718426652881a9e0cb1ddffb0af0f58128396a23 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 11 Feb 2020 19:10:15 +0100
Subject: [PATCH] sharing: Remember the password on remote desktop sharing
If we are going through mutter's RemoteDesktop interface, we don't
seemingly remember the password set. Add support for reading it
from secrets and change the entry password on dialog construction,
to bring it on par with our vino handling.
---
panels/sharing/cc-gnome-remote-desktop.c | 16 ++++++++++++++++
panels/sharing/cc-gnome-remote-desktop.h | 2 ++
panels/sharing/cc-sharing-panel.c | 2 ++
3 files changed, 20 insertions(+)
diff --git a/panels/sharing/cc-gnome-remote-desktop.c b/panels/sharing/cc-gnome-remote-desktop.c
index 8420fddca..599467fb4 100644
--- a/panels/sharing/cc-gnome-remote-desktop.c
+++ b/panels/sharing/cc-gnome-remote-desktop.c
@@ -169,3 +169,19 @@ cc_grd_on_vnc_password_entry_notify_text (GtkEntry *entry,
cancellable, on_password_stored, entry,
NULL);
}
+
+void
+cc_grd_update_password_entry (GtkEntry *entry)
+{
+ g_autoptr(GError) error = NULL;
+ g_autofree gchar *password = NULL;
+
+ password = secret_password_lookup_sync (CC_GRD_VNC_PASSWORD_SCHEMA,
+ NULL, &error,
+ NULL);
+ if (error)
+ g_critical ("Failed to get password: %s", error->message);
+
+ if (password)
+ gtk_entry_set_text (entry, password);
+}
diff --git a/panels/sharing/cc-gnome-remote-desktop.h b/panels/sharing/cc-gnome-remote-desktop.h
index 2a4819986..1f83e2dd6 100644
--- a/panels/sharing/cc-gnome-remote-desktop.h
+++ b/panels/sharing/cc-gnome-remote-desktop.h
@@ -46,4 +46,6 @@ void cc_grd_on_vnc_password_entry_notify_text (GtkEntry *entry,
GParamSpec *pspec,
gpointer user_data);
+void cc_grd_update_password_entry (GtkEntry *entry);
+
#endif /* CC_GNOME_REMOTE_DESKTOP_H */
diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
index ab22f5df8..17ecdb11a 100644
--- a/panels/sharing/cc-sharing-panel.c
+++ b/panels/sharing/cc-sharing-panel.c
@@ -1106,6 +1106,8 @@ cc_sharing_panel_setup_screen_sharing_dialog_gnome_remote_desktop (CcSharingPane
g_signal_connect (priv->screen_sharing_dialog, "hide",
G_CALLBACK (screen_sharing_hide_cb), self);
+ cc_grd_update_password_entry (WID ("remote-control-password-entry"));
+
/* accept at most 8 bytes in password entry */
g_signal_connect (WID ("remote-control-password-entry"), "insert-text",
G_CALLBACK (screen_sharing_password_insert_text_cb), self);
--
2.24.1

47
SOURCES/0001-shell-Don-t-set-per-panel-icon.patch Normal file
View File

@ -0,0 +1,47 @@
From ec695fae92ef7470ef05211160e431f5c3486299 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Tue, 10 Apr 2018 09:43:22 +0200
Subject: [PATCH 1/4] shell: Don't set per-panel icon
The control center app is considered one single application with
a single icon to represent it. Therefore get rid of per-panel
icons.
---
shell/cc-window.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/shell/cc-window.c b/shell/cc-window.c
index 557819e0c76c..33f1ddcad511 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -118,7 +118,6 @@ activate_panel (CcWindow *self,
GIcon *gicon)
{
GtkWidget *box, *title_widget;
- const gchar *icon_name;
if (!id)
return FALSE;
@@ -144,12 +143,8 @@ activate_panel (CcWindow *self,
gtk_stack_set_visible_child_name (GTK_STACK (self->stack), id);
/* set the title of the window */
- icon_name = get_icon_name_from_g_icon (gicon);
-
gtk_window_set_role (GTK_WINDOW (self), id);
gtk_header_bar_set_title (GTK_HEADER_BAR (self->panel_headerbar), name);
- gtk_window_set_default_icon_name (icon_name);
- gtk_window_set_icon_name (GTK_WINDOW (self), icon_name);
title_widget = cc_panel_get_title_widget (CC_PANEL (self->current_panel));
gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->panel_headerbar), title_widget);
@@ -778,4 +773,4 @@ cc_window_set_search_item (CcWindow *center,
gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (center->search_bar), TRUE);
gtk_entry_set_text (GTK_ENTRY (center->search_entry), search);
gtk_editable_set_position (GTK_EDITABLE (center->search_entry), -1);
-}
\ No newline at end of file
+}
--
2.17.0

36
SOURCES/0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch Normal file
View File

@ -0,0 +1,36 @@
From 9dd43182ecb9f8406a1aecd0719f2c5225d3101e Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 28 Nov 2019 15:47:02 +0100
Subject: [PATCH 1/3] sound: Ensure to preserve sound theme when changing from
default
The sound theme change itself triggers signals that are handled here
in the GSettings handlers, possibly resulting in it changing the
theme back to default. Ensure we are handling a real change here,
the sound theme will be updated through other means (eg. the row
changed handler).
---
panels/sound/gvc-sound-theme-chooser.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/panels/sound/gvc-sound-theme-chooser.c b/panels/sound/gvc-sound-theme-chooser.c
index 93eeb155c..9d1051f04 100644
--- a/panels/sound/gvc-sound-theme-chooser.c
+++ b/panels/sound/gvc-sound-theme-chooser.c
@@ -632,11 +632,11 @@ update_theme (GvcSoundThemeChooser *chooser)
load_theme_name (DEFAULT_THEME,
&chooser->current_parent);
}
+
+ update_alerts_from_theme_name (chooser, chooser->current_theme);
}
gtk_widget_set_sensitive (chooser->selection_box, events_enabled);
-
- update_alerts_from_theme_name (chooser, chooser->current_theme);
}
static GObject *
--
2.24.0

102
SOURCES/0001-user-Support-devices-with-more-than-5-enroll-steps.patch Normal file
View File

@ -0,0 +1,102 @@
From 533811deef3155abe71dbace6960feee0aa8a35a Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Wed, 31 Jul 2019 19:09:17 +0200
Subject: [PATCH] user: Support devices with more than 5 enroll steps
We are currently adding support for Synaptics devices that require 8
steps. Add another row for images which brings us to up to 10
supportable steps for now.
---
.../user-accounts/data/account-fingerprint.ui | 62 +++++++++++++++++++
panels/user-accounts/um-fingerprint-dialog.c | 2 +-
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/panels/user-accounts/data/account-fingerprint.ui b/panels/user-accounts/data/account-fingerprint.ui
index e352e6de1..969f7ca30 100644
--- a/panels/user-accounts/data/account-fingerprint.ui
+++ b/panels/user-accounts/data/account-fingerprint.ui
@@ -243,6 +243,68 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkHBox" id="enroll2_hbox">
+ <property name="visible">True</property>
+ <property name="margin-top">24</property>
+ <property name="margin-bottom">24</property>
+ <child>
+ <object class="GtkImage" id="image6">
+ <property name="visible">True</property>
+ <property name="stock">gtk-no</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="stock">gtk-no</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="stock">gtk-no</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="stock">gtk-no</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image10">
+ <property name="visible">True</property>
+ <property name="stock">gtk-no</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
<object class="GtkLabel" id="status-label">
<property name="visible">True</property>
diff --git a/panels/user-accounts/um-fingerprint-dialog.c b/panels/user-accounts/um-fingerprint-dialog.c
index 48b12dcf3..f5dee5b95 100644
--- a/panels/user-accounts/um-fingerprint-dialog.c
+++ b/panels/user-accounts/um-fingerprint-dialog.c
@@ -32,7 +32,7 @@
#include "fingerprint-strings.h"
/* This must match the number of images on the 2nd page in the UI file */
-#define MAX_ENROLL_STAGES 5
+#define MAX_ENROLL_STAGES 10
static GDBusProxy *manager = NULL;
static GDBusConnection *connection = NULL;
--
2.24.1

31
SOURCES/0001-wacom-Pick-libwacom-s-Generic-Pen-stylus-if-tool-ID-.patch Normal file
View File

@ -0,0 +1,31 @@
From 520411840b6cd1b9b72e4a2fd19701aad7145f4f Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 13 Feb 2020 20:28:29 +0100
Subject: [PATCH] wacom: Pick libwacom's Generic Pen stylus if tool ID is 0
We generally use tool ID 0 if the ID is actually unknown, libwacom however
assigns 0xfffff to such device. Make it sure we find the "Generic Pen"
stylus description in that case.
---
panels/wacom/cc-wacom-tool.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/panels/wacom/cc-wacom-tool.c b/panels/wacom/cc-wacom-tool.c
index 1316fa5d6..d54de6160 100644
--- a/panels/wacom/cc-wacom-tool.c
+++ b/panels/wacom/cc-wacom-tool.c
@@ -165,7 +165,10 @@ cc_wacom_tool_initable_init (GInitable *initable,
tool->id = ids[0];
}
- tool->wstylus = libwacom_stylus_get_for_id (wacom_db, tool->id);
+ if (tool->id == 0)
+ tool->wstylus = libwacom_stylus_get_for_id (wacom_db, 0xfffff);
+ else
+ tool->wstylus = libwacom_stylus_get_for_id (wacom_db, tool->id);
if (!tool->wstylus) {
g_set_error (error, 0, 0, "Stylus description not found");
--
2.25.0

72
SOURCES/0001-wacom-Update-Test-your-settings-button-sensitivity-o.patch Normal file
View File

@ -0,0 +1,72 @@
From 7a4532ff72a74ce74dee4b96b993ecd11f557acc Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 11 Feb 2019 20:48:23 +0100
Subject: [PATCH] wacom: Update "Test your settings" button sensitivity on
device availability
The button/popover are meaningless if there's no device to test with. Set
it inactive (so the popover hides if visible) and set insensitive if no
devices are found.
https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/390
---
panels/wacom/cc-wacom-panel.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index 77a1e261f..e4f3ca7fc 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -53,6 +53,7 @@ struct _CcWacomPanelPrivate
GtkWidget *stylus_notebook;
GtkWidget *test_popover;
GtkWidget *test_draw_area;
+ GtkWidget *test_button;
GHashTable *devices; /* key=GsdDevice, value=CcWacomDevice */
GHashTable *pages; /* key=device name, value=GtkWidget */
GHashTable *stylus_pages; /* key=CcWacomTool, value=GtkWidget */
@@ -309,6 +310,22 @@ add_stylus (CcWacomPanel *self,
return TRUE;
}
+static void
+update_test_button (CcWacomPanel *self)
+{
+ CcWacomPanelPrivate *priv = self->priv;;
+
+ if (!priv->test_button)
+ return;
+
+ if (g_hash_table_size (priv->devices) == 0) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->test_button), FALSE);
+ gtk_widget_set_sensitive (priv->test_button, FALSE);
+ } else {
+ gtk_widget_set_sensitive (priv->test_button, TRUE);
+ }
+}
+
static void
update_current_tool (CcWacomPanel *panel,
GdkDevice *device,
@@ -422,6 +439,9 @@ cc_wacom_panel_constructed (GObject *object)
g_signal_connect_object (shell, "event",
G_CALLBACK (on_shell_event_cb), self, 0);
+
+ priv->test_button = button;
+ update_test_button (self);
}
static const char *
@@ -561,6 +581,8 @@ update_current_page (CcWacomPanel *self,
if (num_pages > 1)
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->tablet_notebook), 1);
}
+
+ update_test_button (self);
}
static void
--
2.20.1

41
SOURCES/0001-wacom-Update-to-newer-output-setting.patch Normal file
View File

@ -0,0 +1,41 @@
From 07410fb2f8ecf1dd8bb82bf29a7e81304f62aa81 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 30 Jul 2018 21:10:31 +0200
Subject: [PATCH] wacom: Update to newer "output" setting
The semantics are pretty much the same for opaque tablets, not
much else to do here.
---
panels/wacom/cc-wacom-device.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/panels/wacom/cc-wacom-device.c b/panels/wacom/cc-wacom-device.c
index 488637dec..e0915d5b5 100644
--- a/panels/wacom/cc-wacom-device.c
+++ b/panels/wacom/cc-wacom-device.c
@@ -309,11 +309,11 @@ find_output (GnomeRRScreen *rr_screen,
gsize n;
settings = cc_wacom_device_get_settings (device);
- variant = g_settings_get_value (settings, "display");
+ variant = g_settings_get_value (settings, "output");
edid = g_variant_get_strv (variant, &n);
if (n != 3) {
- g_critical ("Expected 'display' key to store %d values; got %"G_GSIZE_FORMAT".", 3, n);
+ g_critical ("Expected 'output' key to store %d values; got %"G_GSIZE_FORMAT".", 3, n);
goto out;
}
@@ -378,7 +378,7 @@ cc_wacom_device_set_output (CcWacomDevice *device,
values[2] = serial;
}
- g_settings_set_strv (settings, "display", values);
+ g_settings_set_strv (settings, "output", values);
g_free (vendor);
g_free (product);
--
2.21.0

78
SOURCES/0002-shell-Icon-name-helper-returns-symbolic-name.patch Normal file
View File

@ -0,0 +1,78 @@
From b24a8e9aa82b64de970d8137181bf8a03b6f724a Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Tue, 10 Apr 2018 09:47:48 +0200
Subject: [PATCH 2/4] shell: Icon name helper returns symbolic name
The helper function to get the icon name from a GIcon directly
returns the symbolic icon now. This makes it in turn possible
to also directly check if the theme has the icon with the symbolic
name instead of checking of for the full colored one and then
deriving the symbolic name from that. The latter (old) practice
will fail if there is a symbolic icon in the theme that has no
full color icon (like e.g. thunderbolt).
---
shell/cc-window.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/shell/cc-window.c b/shell/cc-window.c
index 33f1ddcad511..3af9cf0bd9fc 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -88,8 +88,8 @@ enum
};
/* Auxiliary methods */
-static const gchar *
-get_icon_name_from_g_icon (GIcon *gicon)
+static gchar *
+get_symbolic_icon_name_from_g_icon (GIcon *gicon)
{
const gchar * const *names;
GtkIconTheme *icon_theme;
@@ -103,8 +103,11 @@ get_icon_name_from_g_icon (GIcon *gicon)
for (i = 0; names[i] != NULL; i++)
{
- if (gtk_icon_theme_has_icon (icon_theme, names[i]))
- return names[i];
+ g_autofree gchar *name = NULL;
+ name = g_strdup_printf ("%s-symbolic", names[i]);
+
+ if (gtk_icon_theme_has_icon (icon_theme, name))
+ return g_steal_pointer (&name);
}
return NULL;
@@ -248,9 +251,8 @@ setup_model (CcWindow *shell)
g_autofree gchar *name = NULL;
g_autofree gchar *description = NULL;
g_autofree gchar *id = NULL;
- g_autofree gchar *symbolic_icon = NULL;
+ g_autofree gchar *icon_name = NULL;
g_autofree GStrv keywords = NULL;
- const gchar *icon_name;
gtk_tree_model_get (model, &iter,
COL_CATEGORY, &category,
@@ -261,8 +263,7 @@ setup_model (CcWindow *shell)
COL_KEYWORDS, &keywords,
-1);
- icon_name = get_icon_name_from_g_icon (icon);
- symbolic_icon = g_strdup_printf ("%s-symbolic", icon_name);
+ icon_name = get_symbolic_icon_name_from_g_icon (icon);
cc_panel_list_add_panel (CC_PANEL_LIST (shell->panel_list),
category,
@@ -270,7 +271,7 @@ setup_model (CcWindow *shell)
name,
description,
keywords,
- symbolic_icon);
+ icon_name);
valid = gtk_tree_model_iter_next (model, &iter);
}
--
2.17.0

6388
SOURCES/0003-thunderbolt-new-panel-for-device-management.patch Normal file
View File

File diff suppressed because it is too large Load Diff

51
SOURCES/0004-thunderbolt-move-to-the-Devices-page.patch Normal file
View File

@ -0,0 +1,51 @@
From 2d1da22e17f703e27ff1b3177e35a54aa0c3aecc Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Fri, 13 Apr 2018 16:03:21 +0200
Subject: [PATCH 4/4] thunderbolt: move to the 'Devices' page
The 'Devices' page is a fitting place for the thunderbolt, being
an IO technology. It is expected that people that need to go to
that page will be sent there via a gnome-shell notification, so
there is no need for it to be on the main page.
Ok'ed by the design team (jimmac).
---
panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in | 2 +-
shell/cc-panel-list.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in b/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
index db2477e45a74..abd317341bfd 100644
--- a/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
+++ b/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
@@ -7,7 +7,7 @@ Terminal=false
Type=Application
NoDisplay=true
StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;X-GNOME-DevicesSettings;X-GNOME-ConnectivitySettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;X-GNOME-DevicesSettings;
OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
index 99d8a91144ad..f5b83509d646 100644
--- a/shell/cc-panel-list.c
+++ b/shell/cc-panel-list.c
@@ -276,7 +276,6 @@ static const gchar * const panel_order[] = {
"wifi",
"mobile-broadband",
"bluetooth",
- "thunderbolt",
"background",
"notifications",
"search",
@@ -295,6 +294,7 @@ static const gchar * const panel_order[] = {
"mouse",
"printers",
"removable-media",
+ "thunderbolt",
"wacom",
"color",
--
2.17.0

102
SOURCES/backport-wacom-tool-id-fixes.patch Normal file
View File

@ -0,0 +1,102 @@
From 6d01e7277f8589a1f0076acbf9e08b45a5a96d0d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 13 Dec 2018 14:32:33 +1000
Subject: [PATCH 1/2] wacom: Map wacom-driver-specific generic IDs to 0
The xf86-input-wacom driver doesn't use 0 for tools that do not have an id or
serials. Serials default to 1, and the tool id is either 0x2 for stylus or 0xa
for eraser, see xf86WacomDefs.h, the defines for STYLUS_DEVICE_ID and
ERASER_DEVICE_ID.
libwacom uses 0xfffff and 0xffffe for the generic pens and all the lookup code
we have in the panel is designed for a serial/tool id of 0. So let's just map
the wacom driver IDs to 0 at the only transition point between Gdk and our
panel.
No devices with serials 0 or hw ids 2/10 exist, so this shouldn't have side
effects. This only affects X + xf86-input-wacom.
---
panels/wacom/cc-wacom-panel.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index e4f3ca7..8748876 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -354,6 +354,14 @@ update_current_tool (CcWacomPanel *panel,
/* Check whether we already know this tool, nothing to do then */
serial = gdk_device_tool_get_serial (tool);
+
+ /* The wacom driver sends serial-less tools with a serial of
+ * 1, libinput uses 0. No device exists with serial 1, let's reset
+ * it here so everything else works as expected.
+ */
+ if (serial == 1)
+ serial = 0;
+
stylus = cc_tablet_tool_map_lookup_tool (priv->tablet_tool_map,
wacom_device, serial);
@@ -361,6 +369,15 @@ update_current_tool (CcWacomPanel *panel,
gboolean added;
id = gdk_device_tool_get_hardware_id (tool);
+
+ /* The wacom driver sends a hw id of 0x2 for stylus and 0xa
+ * for eraser for devices that don't have a true HW id.
+ * Reset those to 0 so we can use the same code-paths
+ * libinput uses.
+ */
+ if (id == 0x2 || id == 0xa)
+ id = 0;
+
stylus = cc_wacom_tool_new (serial, id, wacom_device);
if (!stylus)
return;
--
2.24.1
From 6974aaeb20a5146f95de9c40cd0b3b5967b317a6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 14 Dec 2018 16:14:30 +1000
Subject: [PATCH 2/2] wacom: ignore the wacom driver's touch tool type
When the wacom driver handles the touch device, we get a tool id of 0x3. Let's
ignore that because we don't need a tool for the touch node.
Ideally we should be able to rely on the GDK tool type but that one is always
GDK_DEVICE_TOOL_TYPE_UNKNOWN see
https://gitlab.gnome.org/GNOME/gtk/merge_requests/453
A GTK bug (also fixed in that MR) prevents the tool id from updating.
Until that GTK bug is fixed the pen will only be detected if it is the first
event from this physical device. If the touch node sends an event before the
pen, the pen won't be detected.
---
panels/wacom/cc-wacom-panel.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index 8748876..985ddf5 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -374,9 +374,14 @@ update_current_tool (CcWacomPanel *panel,
* for eraser for devices that don't have a true HW id.
* Reset those to 0 so we can use the same code-paths
* libinput uses.
+ * The touch ID is 0x3, let's ignore that because we don't
+ * have a touch tool and it only happens when the wacom
+ * driver handles the touch device.
*/
if (id == 0x2 || id == 0xa)
id = 0;
+ else if (id == 0x3)
+ return;
stylus = cc_wacom_tool_new (serial, id, wacom_device);
if (!stylus)
--
2.24.1

708
SOURCES/categorize-infiniband.patch Normal file
View File

@ -0,0 +1,708 @@
From c96f608b5d6c3ac12cb8bf76e4688f6c0e8dd059 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 23 Apr 2019 19:29:41 +0200
Subject: [PATCH 1/3] network: Rename section header
The "Bluetooth" section is actually a catchall section for all
device types we don't know much specifically (Includes, but not
limited to Bluetooth).
Rename/relabel it to something more comprehensive.
Closes https://gitlab.gnome.org/GNOME/gnome-control-center/issues/488
---
panels/network/network.ui | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/panels/network/network.ui b/panels/network/network.ui
index 14c70cd..189febf 100644
--- a/panels/network/network.ui
+++ b/panels/network/network.ui
@@ -87,7 +87,7 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
- <!-- Bluetooth header -->
+ <!-- "Other Devices" header -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
@@ -98,7 +98,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0.0</property>
- <property name="label" translatable="yes">Bluetooth</property>
+ <property name="label" translatable="yes">Other Devices</property>
<attributes>
<attribute name="weight" value="bold" />
</attributes>
--
2.27.0.rc2
From fc48e7e618a92f9d52cd61a9ef9b14bf889a9ef3 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 23 Apr 2019 19:46:32 +0200
Subject: [PATCH 2/3] network: Handle Infiniband as a wired interface
The configuration/UI we expose for wired settings are meaningful for those
devices as well.
Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/489
---
panels/network/cc-network-panel.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 51ea823..5cdf616 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -461,6 +461,7 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
/* map the NMDeviceType to the GType, or ignore */
switch (type) {
case NM_DEVICE_TYPE_ETHERNET:
+ case NM_DEVICE_TYPE_INFINIBAND:
device_g_type = NET_TYPE_DEVICE_ETHERNET;
break;
case NM_DEVICE_TYPE_MODEM:
--
2.27.0.rc2
From f71f867f35a8a6c437d2d525e39f3846e0782e4b Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 11 Jun 2020 14:16:03 +0200
Subject: [PATCH 3/3] Update translations
---
po/ca.po | 4 ++++
po/cs.po | 4 ++++
po/da.po | 4 ++++
po/de.po | 4 ++++
po/el.po | 4 ++++
po/en_GB.po | 4 ++++
po/eo.po | 4 ++++
po/es.po | 4 ++++
po/eu.po | 4 ++++
po/fa.po | 4 ++++
po/fi.po | 4 ++++
po/fr.po | 4 ++++
po/fur.po | 4 ++++
po/gl.po | 4 ++++
po/hr.po | 4 ++++
po/hu.po | 4 ++++
po/id.po | 4 ++++
po/it.po | 4 ++++
po/ja.po | 4 ++++
po/ko.po | 4 ++++
po/lt.po | 4 ++++
po/ms.po | 4 ++++
po/nb.po | 4 ++++
po/ne.po | 4 ++++
po/nl.po | 4 ++++
po/oc.po | 5 +++++
po/pa.po | 4 ++++
po/pl.po | 4 ++++
po/pt_BR.po | 4 ++++
po/ro.po | 4 ++++
po/ru.po | 4 ++++
po/sk.po | 4 ++++
po/sl.po | 4 ++++
po/sr.po | 4 ++++
po/sv.po | 4 ++++
po/tr.po | 4 ++++
po/uk.po | 5 +++++
po/zh_CN.po | 4 ++++
po/zh_TW.po | 4 ++++
39 files changed, 158 insertions(+)
diff --git a/po/ca.po b/po/ca.po
index 0592282..36172d9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -224,6 +224,10 @@ msgstr "Desactiveu el mode d'avió per a habilitar el Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Altres dispositius"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Activeu i desactiveu el Bluetooth i connecteu els dispositius"
diff --git a/po/cs.po b/po/cs.po
index 7d6c2cc..b827d87 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -226,6 +226,10 @@ msgstr "Vypněte přepínač režimu „letadlo“, aby se povolilo Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Ostatní zařízení"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Zapnout a vypnout Bluetooth a připojit se k zařízením"
diff --git a/po/da.po b/po/da.po
index dc85493..bfcd034 100644
--- a/po/da.po
+++ b/po/da.po
@@ -234,6 +234,10 @@ msgstr "Sluk for kontakten Flytilstand for at aktivere Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Andre enheder"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Slå Bluetooth til eller fra og tilslut dine enheder"
diff --git a/po/de.po b/po/de.po
index 78325a2..a5d65f8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -230,6 +230,10 @@ msgstr ""
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Weitere Geräte"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Schalten Sie Bluetooth an oder aus und verbinden Sie Ihre Geräte"
diff --git a/po/el.po b/po/el.po
index a4a1374..81120c7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2934,6 +2934,10 @@ msgstr "Απενεργοποίηση συσκευής"
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Άλλες συσκευές"
+
#: ../panels/network/network.ui.h:3
msgid "Not set up"
msgstr "Δεν είναι ρυθμισμένο"
diff --git a/po/en_GB.po b/po/en_GB.po
index 96733a1..1bba5a6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -213,6 +213,10 @@ msgstr "Turn off the Aeroplane mode switch to enable Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Other Devices"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Turn Bluetooth on and off and connect your devices"
diff --git a/po/eo.po b/po/eo.po
index a13393b..473ed08 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3000,6 +3000,10 @@ msgstr "Elŝalti aparaton"
msgid "Bluetooth"
msgstr "Bludento"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Aliaj aparatoj"
+
#: ../panels/network/network.ui.h:3
msgid "Not set up"
msgstr ""
diff --git a/po/es.po b/po/es.po
index b59dcd8..4ae235b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -221,6 +221,10 @@ msgstr "Apague el modo avión para activar el Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Otros dispositivos"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Activar y desactivar Bluetooth y conectar sus dispositivos"
diff --git a/po/eu.po b/po/eu.po
index b702316..8ed6d30 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2906,6 +2906,10 @@ msgstr "Desaktibatu gailua"
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Beste gailuak"
+
#: ../panels/network/network.ui.h:3
msgid "Not set up"
msgstr "Konfiguratu gabe"
diff --git a/po/fa.po b/po/fa.po
index 12a92ac..101b73c 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2792,6 +2792,10 @@ msgstr "خاموش کردن دستگاه"
msgid "Bluetooth"
msgstr "بلوتوث"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "دیگر دستگاه‌ها"
+
#: ../panels/network/network.ui.h:3
msgid "Not set up"
msgstr "برپا نشده"
diff --git a/po/fi.po b/po/fi.po
index 30f8098..b278e0f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -228,6 +228,10 @@ msgstr "Poista lentokonetila käytöstä käyttääksesi Bluetoothia."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Muut laitteet"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Kytke Bluetooth päälle tai pois ja yhdistä laitteita"
diff --git a/po/fr.po b/po/fr.po
index fbe309a..7c55fd2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -241,6 +241,10 @@ msgstr "Désactivez le mode avion pour activer le Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Autres périphériques"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Active/désactive le Bluetooth et connecte vos périphériques"
diff --git a/po/fur.po b/po/fur.po
index 7cc4bb2..7bdfcba 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -211,6 +211,10 @@ msgstr "Distude il cric de modalitât Avion par abilitâ il Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Altris dispositîfs"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Impie e distude il Bluetooth e conet i tiei dispositîfs"
diff --git a/po/gl.po b/po/gl.po
index 6a2061f..b4763b7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -222,6 +222,10 @@ msgstr "Apague o modo avión para activar o Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Outros dispositivos"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Active ou desactive o Bluetooth e conecte os seus dispositivos"
diff --git a/po/hr.po b/po/hr.po
index 480fe50..740ef7b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -209,6 +209,10 @@ msgstr "Isključite način rada u zrakoplovu kako bi mogli kristiti Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Ostali uređaji"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Uključite ili isključite Bluetooth i povežite svoje uređaje"
diff --git a/po/hu.po b/po/hu.po
index 9fddf1c..41b0e51 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -220,6 +220,10 @@ msgstr ""
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Egyéb eszközök"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Kapcsolja be és ki a Bluetooth-t, majd csatlakoztassa eszközeit"
diff --git a/po/id.po b/po/id.po
index ad2772a..49c370d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -213,6 +213,10 @@ msgstr "Matikan saklar mode Pesawat Terbang untuk memfungsikan Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Perangkat Lainnya"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Nyalakan dan matikan Bluetooth dan sambungkan perangkat Anda"
diff --git a/po/it.po b/po/it.po
index cdbc7b0..1390c7c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -216,6 +216,10 @@ msgstr "Disattivare la modalità aereo via hardware per abilitare il Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Altri dispositivi"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Attiva e disattiva il Bluetooth e connette i propri dispositivi"
diff --git a/po/ja.po b/po/ja.po
index 5f4767f..bc144dd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2893,6 +2893,10 @@ msgstr "デバイスをオフにする"
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "その他のデバイス"
+
#: ../panels/network/network.ui.h:3
msgid "Not set up"
msgstr "未設定"
diff --git a/po/ko.po b/po/ko.po
index 49d9c2f..3d350b2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -230,6 +230,10 @@ msgstr "블루투스를 사용하려면 비행 모드 스위치를 끄십시오.
msgid "Bluetooth"
msgstr "블루투스"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "기타 장치"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "블루투스를 켜거나 끄고 블루투스 장치에 연결합니다"
diff --git a/po/lt.po b/po/lt.po
index 3a1292e..9328564 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -220,6 +220,10 @@ msgstr "Išjunkite skrydžio veiksenos jungiklį Bluetooth įjungimui."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Kiti įrenginiai"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Įjunkite arba išjunkite Bluetooth ir junkitės prie savo įrenginių"
diff --git a/po/ms.po b/po/ms.po
index c78df1b..e90eec8 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2723,6 +2723,10 @@ msgstr "Profail ujian:"
msgid "VPN"
msgstr ""
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Lain-lain Peranti"
+
#: ../panels/network/connection-editor/net-connection-editor.c:578
msgid "Bond"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index e1e4b11..02815b2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2842,6 +2842,10 @@ msgstr "Slå enhet av"
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Andre enheter"
+
#: ../panels/network/network.ui.h:3
msgid "Not set up"
msgstr "Ikke satt opp"
diff --git a/po/ne.po b/po/ne.po
index 6cd1bb9..ad3a137 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -2448,6 +2448,10 @@ msgstr "नायाँ प्रोफाइल"
msgid "VPN"
msgstr "भीपीएन"
+#: panels/network/network.ui:102
+msgid "Other Devices"
+msgstr "अरु यन्त्रहरू "
+
#: ../panels/network/connection-editor/net-connection-editor.c:751
msgid "Import from file…"
msgstr "फाईलबाट आयात गर्नुहोस्"
diff --git a/po/nl.po b/po/nl.po
index 3b48a77..d81a865 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -233,6 +233,10 @@ msgstr "Vliegtuigstand uitschakelen om Bluetooth mogelijk te maken."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Overige apparaten"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Bluetooth aan- en uitzetten en uw apparaten aansluiten"
diff --git a/po/oc.po b/po/oc.po
index bcd7fbe..025b78b 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -2815,6 +2815,11 @@ msgstr "Apondre lo periferic"
msgid "Remove Device"
msgstr "Levar lo periferic"
+#: panels/network/network.ui:102
+#| msgid "Devices"
+msgid "Other Devices"
+msgstr "Autres periferics"
+
#: ../panels/network/network-vpn.ui.h:1
msgid "VPN Type"
msgstr "Tipe de VPN"
diff --git a/po/pa.po b/po/pa.po
index ce50b62..a894921 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -215,6 +215,10 @@ msgstr "ਬਲੂਟੁੱਥ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ ਏਅ
msgid "Bluetooth"
msgstr "ਬਲੂਟੁੱਥ"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "ਹੋਰ ਡਿਵਾਈਸ"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "ਬਲੂਟੁੱਥ ਜੰਤਰ ਨੂੰ ਚਾਲੂ ਤੇ ਬੰਦ ਕਰੋ ਅਤੇ ਆਪਣੇ ਜੰਤਰਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ-"
diff --git a/po/pl.po b/po/pl.po
index 9093e4e..c1536f4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -214,6 +214,10 @@ msgstr "Należy wyłączyć przełącznik trybu sprzętowego, aby włączyć Blu
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Inne urządzenia"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Włączanie Bluetooth i łączenie z urządzeniami"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index acad283..bc0861b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -236,6 +236,10 @@ msgstr "Desligue o alternador do modo avião para habilitar o Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Outros dispositivos"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Ligue e desligue o Bluetooth e conecte seus dispositivos"
diff --git a/po/ro.po b/po/ro.po
index 10fc7eb..6d3f307 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -221,6 +221,10 @@ msgstr "Opriți modul avion pentru a putea activa Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:102
+msgid "Other Devices"
+msgstr "Alte dispozitive"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Deschideți și închideți Bluetooth și conectați-vă dispozitivele"
diff --git a/po/ru.po b/po/ru.po
index 52762fd..414b598 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -226,6 +226,10 @@ msgstr "Для включения Bluetooth выключите режим для
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Другие устройства"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Включение и отключение Bluetooth. Подключение устройств Bluetooth"
diff --git a/po/sk.po b/po/sk.po
index 3d67fb2..1a4ee5e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -231,6 +231,10 @@ msgstr "Vypnite prepínač režimu v lietadle na povolenie rozhrania Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Ostatné zariadenia"
+
# desktop entry comment
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
diff --git a/po/sl.po b/po/sl.po
index ba5f934..5008f64 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -215,6 +215,10 @@ msgstr "Izklopi letalski način za omogočanje vmesnika Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Druge naprave"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Vklopite in izklopite Bluetooth in povežite svoje naprave"
diff --git a/po/sr.po b/po/sr.po
index 1c747a4..6604629 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -218,6 +218,10 @@ msgstr "Искључите авионски режим рада бисте ук
msgid "Bluetooth"
msgstr "Блутут"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Други уређаји"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Укључите или искључите блутут и повежите ваше уређаје"
diff --git a/po/sv.po b/po/sv.po
index d8f4138..25567fb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -217,6 +217,10 @@ msgstr "Slå av växelknappen för flygplansläge för att aktivera Bluetooth."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Andra enheter"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Slå på samt av Bluetooth och anslut dina enheter"
diff --git a/po/tr.po b/po/tr.po
index 7ac1573..5ef1d82 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -220,6 +220,10 @@ msgstr "Bluetooth’u etkinleştirmek için Uçak kipini kapat."
msgid "Bluetooth"
msgstr "Bluetooth"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "Diğer Aygıtlar"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Bluetooth’u açıp kapatın ve aygıtlarınızı bağlayın"
diff --git a/po/uk.po b/po/uk.po
index 9e9d8dc..4bc1cbb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2900,6 +2900,11 @@ msgstr "Додати пристрій"
msgid "Remove Device"
msgstr "Вилучити носій"
+#: panels/network/network.ui:68
+#| msgid "Devices"
+msgid "Other Devices"
+msgstr "Інші пристрої"
+
#: ../panels/network/network-vpn.ui.h:1
msgid "VPN Type"
msgstr "Тип VPN"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c7050c..c3153b1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2780,6 +2780,10 @@ msgstr "添加设备"
msgid "Remove Device"
msgstr "移除设备"
+#: panels/network/network.ui:102
+msgid "Other Devices"
+msgstr "其他设备"
+
#: ../panels/network/network-vpn.ui.h:1
msgid "VPN Type"
msgstr "VPN 类型"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8d5a5a0..e0de674 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -215,6 +215,10 @@ msgstr "關閉飛安模式開關以啟用藍牙。"
msgid "Bluetooth"
msgstr "藍牙"
+#: panels/network/network.ui:68
+msgid "Other Devices"
+msgstr "其他裝置"
+
#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "開啟或關閉藍牙與連接您的裝置"
--
2.27.0.rc2

99
SOURCES/distro-logo.patch Normal file
View File

@ -0,0 +1,99 @@
From 73be5fcb0764cb8e7bdcbcf3ee06b833078d576a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 31 Mar 2013 20:28:19 -0400
Subject: [PATCH] info: Switch around GNOME and distro information
This makes the distribution logo prominent, and puts GNOME version
information in the small print.
https://bugzilla.gnome.org/show_bug.cgi?id=695691
---
panels/info/cc-info-overview-panel.c | 7 ++-----
panels/info/info-overview.ui | 14 ++++++++------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
index 7a5879c6b..ce15e92d0 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c
@@ -446,7 +446,7 @@ static char *
get_os_name (void)
{
GHashTable *os_info;
- gchar *name, *version_id, *pretty_name, *build_id;
+ gchar *name, *version_id, *build_id;
gchar *result = NULL;
g_autofree gchar *name_version = NULL;
@@ -457,12 +457,9 @@ get_os_name (void)
name = g_hash_table_lookup (os_info, "NAME");
version_id = g_hash_table_lookup (os_info, "VERSION_ID");
- pretty_name = g_hash_table_lookup (os_info, "PRETTY_NAME");
build_id = g_hash_table_lookup (os_info, "BUILD_ID");
- if (pretty_name)
- name_version = g_strdup (pretty_name);
- else if (name && version_id)
+ if (name && version_id)
name_version = g_strdup_printf ("%s %s", name, version_id);
else
name_version = g_strdup (_("Unknown"));
diff --git a/panels/info/info-overview.ui b/panels/info/info-overview.ui
index 219a83c4c..aa87fbec2 100644
--- a/panels/info/info-overview.ui
+++ b/panels/info/info-overview.ui
@@ -12,13 +12,14 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">18</property>
+ <property name="spacing">6</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="system_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="resource">/org/gnome/control-center/info/GnomeLogoVerticalMedium.svg</property>
+ <property name="pixel_size">128</property>
+ <property name="icon_name">fedora-logo-icon</property>
</object>
<packing>
<property name="expand">False</property>
@@ -27,11 +28,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="version_label">
+ <object class="GtkLabel" id="os_name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Version 3.0</property>
<property name="selectable">True</property>
+ <property name="margin-bottom">24</property>
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
@@ -118,8 +120,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes" comments="To translators: this field contains the distro name and version">OS name</property>
- <property name="mnemonic_widget">os_name_label</property>
+ <property name="label">GNOME</property>
+ <property name="mnemonic_widget">version_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -228,7 +230,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="os_name_label">
+ <object class="GtkLabel" id="version_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
--
2.13.0

325
SPECS/gnome-control-center.spec Normal file
View File

@ -0,0 +1,325 @@
%define gnome_online_accounts_version 3.25.3
%define glib2_version 2.53.0
%define gnome_desktop_version 3.27.90
%define gsd_version 3.25.90
%define gsettings_desktop_schemas_version 3.27.2
%define gtk3_version 3.22.20
%define upower_version 0.99.6
%define cheese_version 3.28.0
%define gnome_bluetooth_version 3.18.2
Name: gnome-control-center
Version: 3.28.2
Release: 22%{?dist}
Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA
URL: http://www.gnome.org
Source0: https://download.gnome.org/sources/gnome-control-center/3.28/gnome-control-center-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=695691
Patch0: distro-logo.patch
# thunderbolt panel backported to 3.28.x
# https://gitlab.gnome.org/gicmo/gnome-control-center/commits/thunderbolt_3_28_1
Patch1: 0001-shell-Don-t-set-per-panel-icon.patch
Patch2: 0002-shell-Icon-name-helper-returns-symbolic-name.patch
Patch3: 0003-thunderbolt-new-panel-for-device-management.patch
Patch4: 0004-thunderbolt-move-to-the-Devices-page.patch
# Backport of F29 screen sharing UI
Patch5: 0001-sharing-Enable-settings-widget-for-gnome-remote-desk.patch
Patch6: 0001-wacom-Update-Test-your-settings-button-sensitivity-o.patch
Patch7: 0001-wacom-Update-to-newer-output-setting.patch
# Subscription management
Patch8: 0001-info-Add-subscription-manager-integration.patch
Patch9: 0001-sharing-Fix-warning-when-disabling-sharing.patch
Patch10: 0001-network-Use-g_signal_connect_object-when-dealing-wit.patch
Patch11: 0001-common-fix-udev-based-device-removal.patch
Patch12: 0001-network-Keep-a-ref-on-NetDeviceEthernet-while-a-edit.patch
Patch13: 0001-network-Make-list-in-new-VPN-dialog-fill-up-space.patch
Patch14: 0001-network-Make-IPv4-v6-pages-drive-the-scrolledwindow-.patch
Patch15: 0001-network-Update-VPN-empty-label-status-after-removing.patch
Patch16: 0001-network-Use-connect-object-on-signals.patch
Patch17: 0001-sharing-Remember-the-password-on-remote-desktop-shar.patch
Patch18: 0001-wacom-Pick-libwacom-s-Generic-Pen-stylus-if-tool-ID-.patch
Patch20: 0001-user-Support-devices-with-more-than-5-enroll-steps.patch
Patch21: backport-wacom-tool-id-fixes.patch
Patch22: 0001-power-correct-the-value-of-90-minutes-to-5400.patch
Patch23: 0001-sound-Ensure-to-preserve-sound-theme-when-changing-f.patch
Patch24: categorize-infiniband.patch
BuildRequires: chrpath
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl libxslt
BuildRequires: gettext
BuildRequires: libXxf86misc-devel
BuildRequires: meson
BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(cheese) >= %{cheese_version}
BuildRequires: pkgconfig(cheese-gtk)
BuildRequires: pkgconfig(clutter-gtk-1.0)
BuildRequires: pkgconfig(colord)
BuildRequires: pkgconfig(colord-gtk)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gdk-wayland-3.0)
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
BuildRequires: pkgconfig(gnome-settings-daemon) >= %{gsd_version}
BuildRequires: pkgconfig(goa-1.0) >= %{gnome_online_accounts_version}
BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(grilo-0.3)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(ibus-1.0)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libnm)
BuildRequires: pkgconfig(libnma)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpulse-mainloop-glib)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mm-glib)
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(pwquality)
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(upower-glib) >= %{upower_version}
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xi)
%ifnarch s390 s390x
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= %{gnome_bluetooth_version}
BuildRequires: pkgconfig(libwacom)
%endif
# Versioned library deps
Requires: cheese-libs%{?_isa} >= %{cheese_version}
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
Requires: gnome-online-accounts%{?_isa} >= %{gnome_online_accounts_version}
Requires: gnome-settings-daemon%{?_isa} >= %{gsd_version}
# For g-s-d subscription manager patches
Requires: gnome-settings-daemon%{?_isa} >= 3.32.0-7
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
Requires: gtk3%{?_isa} >= %{gtk3_version}
Requires: upower%{?_isa} >= %{upower_version}
%ifnarch s390 s390x
Requires: gnome-bluetooth%{?_isa} >= 1:%{gnome_bluetooth_version}
%endif
Requires: %{name}-filesystem = %{version}-%{release}
# For user accounts
Requires: accountsservice
Requires: alsa-lib
# For the thunderbolt panel
Requires: bolt
# For the color panel
Requires: colord
# For the printers panel
Requires: cups-pk-helper
Requires: dbus-x11
# For the info/details panel
Requires: glx-utils
# For the user languages
Requires: iso-codes
# For the network panel
Requires: nm-connection-editor
Recommends: NetworkManager-wifi
%if 0%{?fedora}
# For the sharing panel
Requires: rygel
%endif
# For the info/details panel
Requires: switcheroo-control
# For the keyboard panel
Requires: /usr/bin/gkbd-keyboard-display
Recommends: vino
Recommends: system-config-printer-libs
# Renamed in F28
Provides: control-center = 1:%{version}-%{release}
Provides: control-center%{?_isa} = 1:%{version}-%{release}
Obsoletes: control-center < 1:%{version}-%{release}
%description
This package contains configuration utilities for the GNOME desktop, which
allow to configure accessibility options, desktop fonts, keyboard and mouse
properties, sound setup, desktop theme and background, user interface
properties, screen resolution, and other settings.
%package filesystem
Summary: GNOME Control Center directories
# NOTE: this is an "inverse dep" subpackage. It gets pulled in
# NOTE: by the main package and MUST not depend on the main package
BuildArch: noarch
# Renamed in F28
Provides: control-center-filesystem = 1:%{version}-%{release}
Obsoletes: control-center-filesystem < 1:%{version}-%{release}
%description filesystem
The GNOME control-center provides a number of extension points
for applications. This package contains directories where applications
can install configuration files that are picked up by the control-center
utilities.
%prep
%autosetup -p1
%build
%meson -Ddocumentation=true
%meson_build
%install
%meson_install
# We do want this
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
# We don't want these
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts
# Remove rpath
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
%find_lang %{name} --all-name --with-gnome
%files -f %{name}.lang
%license COPYING
%doc AUTHORS NEWS README
%{_bindir}/gnome-control-center
%{_datadir}/applications/*.desktop
%{_datadir}/bash-completion/completions/gnome-control-center
%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
%{_datadir}/dbus-1/services/org.gnome.ControlCenter.service
%{_datadir}/gettext/
%{_datadir}/glib-2.0/schemas/org.gnome.ControlCenter.gschema.xml
%{_datadir}/gnome-control-center/icons/
%{_datadir}/gnome-control-center/keybindings/*.xml
%{_datadir}/gnome-control-center/pixmaps
%{_datadir}/gnome-control-center/sounds/gnome-sounds-default.xml
%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/man/man1/gnome-control-center.1*
%{_datadir}/metainfo/gnome-control-center.appdata.xml
%{_datadir}/pixmaps/faces
%{_datadir}/pkgconfig/gnome-keybindings.pc
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.*.policy
%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%{_datadir}/sounds/gnome/default/*/*.ogg
%{_libexecdir}/cc-remote-login-helper
%{_libexecdir}/gnome-control-center-search-provider
%files filesystem
%dir %{_datadir}/gnome-control-center
%dir %{_datadir}/gnome-control-center/keybindings
%dir %{_datadir}/gnome-control-center/sounds
%dir %{_datadir}/gnome/wm-properties
%changelog
* Wed Sep 02 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-22
- Categorize Infiniband devices correctly
Resolves: #1826379
* Mon Jun 29 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-21
- Honor sound theme changes when changing from the default theme
- Resolves: #1706008
* Mon Jun 29 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-20
- Fix 90min automatic sleep option to not last 80min
- Resolves: #1706076
* Fri Feb 21 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-19
- Backport tool serial/ID detection fixes
- Resolves: #1782517
* Thu Feb 13 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-18
- Pick "Generic Pen" correctly on unknown tool IDs
- Resolves: #1782517
* Thu Feb 13 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-17
- Restore remote desktop password on wayland
- Resolves: #1763207
* Mon Jan 20 2020 Benjamin Berg <bberg@redhat.com> - 3.28.2-16
- Add patch to support more than 5 enroll steps
- Resolves: #1789474
* Mon Dec 16 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-15
- Fix another crash changing panel with Ethernet dialog opened
- Resolves: #1692299
* Fri Dec 13 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-14
- Restore placeholder label after removing last VPN connection
- Resolves: #1782425
* Fri Dec 13 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-13
- Make IPv4/v6 configuration pages scroll to focus
- Resolves: #1671709
* Fri Dec 13 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-12
- Fix spacing in "new VPN" dialog
- Resolves: #1656988
* Wed Dec 04 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-11
- Fix crash when changing panel with Ethernet dialog opened
- Resolves: #1692299
* Wed Dec 04 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-10
- Fix Wacom tablet removal on wayland session
- Resolves: #1658001
* Tue Dec 03 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-9
- Fix possible crash when closing the wifi panel
- Resolves: #1778668
* Mon Dec 01 2019 Tomas Pelka <tpelka@redhat.com> - 3.28.2-8
- Need rebuild in correct build target
- Resolves: #1749372
* Fri Nov 29 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-7
- Fix warning when disabling sharing
- Resolves: #1749372
* Mon Nov 18 2019 Kalev Lember <klember@redhat.com> - 3.28.2-6
- Add subscription manager integration
- Resolves: #1720251
* Tue Jul 23 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-5
- Update wacom panel to newer "output" setting
- Resolves: #1718133
* Mon Feb 11 2019 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-4
- Update "Test your settings" wacom button sensitivity on device availability
- Resolves: #1656995
* Thu Dec 13 2018 Marek Kasik <mkasik@redhat.com> - 3.28.2-3
- Recommend system-config-printer-libs as a dependency
- Resolves: #1637370
* Tue Aug 14 2018 Jonas Ådahl <jadahl@redhat.com> - 3.28.2-1
- Backport screen sharing UI (rhbz#1615810)
* Tue May 29 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
- Update to 3.28.2
* Wed May 23 2018 Pete Walter <pwalter@fedoraproject.org> - 3.28.1-4
- Change NetworkManager-wifi requires to recommends (#1478661)
* Tue May 22 2018 Ray Strode <rstrode@redhat.com> - 3.28.1-3
- Change vino requires to a vino recommends
* Fri Apr 13 2018 Kalev Lember <klember@redhat.com> - 3.28.1-2
- Backport new thunderbolt panel
* Tue Apr 10 2018 Pete Walter <pwalter@fedoraproject.org> - 3.28.1-1
- Rename control-center to gnome-control-center