Skip to content
Commits on Source (22)
Expand all Hide whitespace changes
Inline Side-by-side
NEWS
View file @ cdc476fe
================
Version 3.38.3
================
- Updated translations
Display:
- Fix crash when unable to get display configuration.
Network:
- Fix smal leak getting WiFi secrets.
Printers:
- Fix small leaks in new printer dialog.
User Accounts:
- Fix crash showing error in fingerprint dialog.
================
Version 3.38.2
================
......
debian/changelog
View file @ cdc476fe
gnome-control-center (1:3.38.3-1ubuntu1) hirsute; urgency=medium
* New upstream version based on Debian (lp: #1911918)
* debian/patches/0016-diagnostics-Add-Whoopsie-support.patch:
- display the whoopsie status to 'autoreport' if the corresponding key
is set to true even if report=false (see lp #1906877)
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 15 Jan 2021 15:10:51 +0100
gnome-control-center (1:3.38.3-1) unstable; urgency=medium
* Team upload
* New upstream release
* Use upstream/3.38.x branch for packaging
* Standards-Version: 4.5.1 (no changes required)
-- Simon McVittie <smcv@debian.org> Fri, 15 Jan 2021 09:34:04 +0000
gnome-control-center (1:3.38.2-2) unstable; urgency=medium
* debian/control.in: Explicitly add libgoa-backend-1.0-dev to the BD
* debian/control.in: Explicitly add libsoup2.4-dev to the BD
-- Laurent Bigonville <bigon@debian.org> Fri, 25 Dec 2020 10:16:26 +0100
gnome-control-center (1:3.38.2-1ubuntu2) hirsute; urgency=medium
[ Brian Murray ]
......
debian/control
View file @ cdc476fe
......@@ -30,6 +30,7 @@ Build-Depends: debhelper-compat (= 12),
libgnome-bluetooth-dev (>= 3.18.0) [linux-any],
libibus-1.0-dev (>= 1.5.2),
libgoa-1.0-dev (>= 3.25.3),
libgoa-backend-1.0-dev (>= 3.25.3),
libgrilo-0.3-dev (>= 0.3.0),
libgsound-dev,
libgtk-3-dev (>= 3.22.20),
......@@ -46,6 +47,7 @@ Build-Depends: debhelper-compat (= 12),
libsecret-1-dev,
libsmbclient-dev (>= 2:3.6.12-1~),
libsnapd-glib-dev (>= 1.57),
libsoup2.4-dev,
libudisks2-dev,
libupower-glib-dev (>= 0.99.8),
libwacom-dev (>= 0.7) [linux-any],
......@@ -63,7 +65,7 @@ Build-Depends: debhelper-compat (= 12),
xvfb,
python3-dbusmock,
at-spi2-core
Standards-Version: 4.5.0
Standards-Version: 4.5.1
Rules-Requires-Root: no
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center
......
debian/control.in
View file @ cdc476fe
......@@ -26,6 +26,7 @@ Build-Depends: debhelper-compat (= 12),
libgnome-bluetooth-dev (>= 3.18.0) [linux-any],
libibus-1.0-dev (>= 1.5.2),
libgoa-1.0-dev (>= 3.25.3),
libgoa-backend-1.0-dev (>= 3.25.3),
libgrilo-0.3-dev (>= 0.3.0),
libgsound-dev,
libgtk-3-dev (>= 3.22.20),
......@@ -42,6 +43,7 @@ Build-Depends: debhelper-compat (= 12),
libsecret-1-dev,
libsmbclient-dev (>= 2:3.6.12-1~),
libsnapd-glib-dev (>= 1.57),
libsoup2.4-dev,
libudisks2-dev,
libupower-glib-dev (>= 0.99.8),
libwacom-dev (>= 0.7) [linux-any],
......@@ -59,7 +61,7 @@ Build-Depends: debhelper-compat (= 12),
xvfb,
python3-dbusmock,
at-spi2-core
Standards-Version: 4.5.0
Standards-Version: 4.5.1
Rules-Requires-Root: no
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center
......
debian/gbp.conf
View file @ cdc476fe
[DEFAULT]
pristine-tar = True
debian-branch=ubuntu/master
upstream-branch=upstream/latest
upstream-branch = upstream/3.38.x
debian-tag=ubuntu/%(version)s
upstream-vcs-tag = %(version)s
......
debian/patches/0016-diagnostics-Add-Whoopsie-support.patch
View file @ cdc476fe
......@@ -74,7 +74,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
};
CC_PANEL_REGISTER (CcDiagnosticsPanel, cc_diagnostics_panel)
@@ -71,9 +82,85 @@ abrt_vanished_cb (GDBusConnection *conne
@@ -71,9 +82,82 @@ abrt_vanished_cb (GDBusConnection *conne
gpointer user_data)
{
g_debug ("ABRT vanished");
......@@ -143,13 +143,10 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
+{
+ const gchar *id = "never";
+
+ if (whoopsie_preferences_get_report_crashes (self->whoopsie))
+ {
+ if (whoopsie_preferences_get_automatically_report_crashes (self->whoopsie))
+ id = "auto";
+ else
+ id = "manual";
+ }
+ if (whoopsie_preferences_get_automatically_report_crashes (self->whoopsie))
+ id = "auto";
+ else if (whoopsie_preferences_get_report_crashes (self->whoopsie))
+ id = "manual";
+
+ g_signal_handlers_block_by_func (self->whoopsie_combo, on_whoopsie_combo_changed_cb, self);
+ gtk_combo_box_set_active_id (GTK_COMBO_BOX (self->whoopsie_combo), id);
......@@ -160,7 +157,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
void
cc_diagnostics_panel_static_init_func (void)
{
@@ -85,7 +172,9 @@ cc_diagnostics_panel_static_init_func (v
@@ -85,7 +169,9 @@ cc_diagnostics_panel_static_init_func (v
NULL,
NULL);
......@@ -170,7 +167,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
}
static void
@@ -110,7 +199,13 @@ cc_diagnostics_panel_class_init (CcDiagn
@@ -110,7 +196,13 @@ cc_diagnostics_panel_class_init (CcDiagn
gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, diagnostics_explanation_label);
gtk_widget_class_bind_template_child (widget_class, CcDiagnosticsPanel, diagnostics_list_box);
......@@ -184,7 +181,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
}
static void
@@ -120,6 +215,7 @@ cc_diagnostics_panel_init (CcDiagnostics
@@ -120,6 +212,7 @@ cc_diagnostics_panel_init (CcDiagnostics
g_autofree gchar *url = NULL;
g_autofree gchar *msg = NULL;
g_autofree gchar *link = NULL;
......@@ -192,7 +189,7 @@ Index: gnome-control-center/panels/diagnostics/cc-diagnostics-panel.c
g_resources_register (cc_diagnostics_get_resource ());
@@ -135,6 +231,26 @@ cc_diagnostics_panel_init (CcDiagnostics
@@ -135,6 +228,26 @@ cc_diagnostics_panel_init (CcDiagnostics
self->abrt_switch, "active",
G_SETTINGS_BIND_DEFAULT);
......
debian/patches/0033-sound-update-the-profile-list-after-getting-the-sign.patch deleted 100644 → 0
View file @ d2c71e5b
From 9b81e0ee4522ca27ca3ffe9a7d9fb4583f507752 Mon Sep 17 00:00:00 2001
From: Hui Wang <hui.wang@canonical.com>
Date: Fri, 4 Sep 2020 17:06:27 +0800
Subject: [PATCH] sound: update the profile list after getting the signal from
gvc
In the ubuntu 20.04, we found a regression on HDMI audio. We plug a
HDMI/DP monitor, the output device is the speaker in the output device
combo box, then we select the HDMI from the combo box, the output
device is switched to HDMI audio successfully, but the configuration
box is empty. This will not happen in the ubuntu 18.04, the profile
will show hdmi-stereo in this situation. So I think this is a
regression.
When problem happens, I could see the errors from log:
Gvc: DEBUG: Matching profile for 'output:analog-stereo' is '(null)'
Gvc: DEBUG: Matching profile for 'output:analog-stereo' is '(null)'
Gvc: DEBUG: Matching profile for 'output:analog-stereo' is '(null)'
Through debugging, I found the cc_profile_combo_box_set_device() is
called too early. In the ubuntu 18.04, this function is called after
pulseaudio changes the active_profile, but in the ubuntu 20.04, it is
called ahead of pulseaudio changes the active_profile.
To fix it, add a signal callback function, after pulseaudio changes
the active_profile, this callback function will be called, then call
cc_profile_combo_box_set_device().
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
panels/sound/cc-sound-panel.c | 44 ++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 6 deletions(-)
Index: gnome-control-center-3.38.0/panels/sound/cc-sound-panel.c
===================================================================
--- gnome-control-center-3.38.0.orig/panels/sound/cc-sound-panel.c
+++ gnome-control-center-3.38.0/panels/sound/cc-sound-panel.c
@@ -104,9 +104,6 @@ output_device_changed_cb (CcSoundPanel *
gboolean can_fade = FALSE, has_lfe = FALSE;
device = cc_device_combo_box_get_device (self->output_device_combo_box);
- cc_profile_combo_box_set_device (self->output_profile_combo_box, self->mixer_control, device);
- gtk_widget_set_visible (GTK_WIDGET (self->output_profile_row),
- cc_profile_combo_box_get_profile_count (self->output_profile_combo_box) > 1);
if (device != NULL)
stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device);
@@ -139,9 +136,6 @@ input_device_changed_cb (CcSoundPanel *s
GvcMixerStream *stream = NULL;
device = cc_device_combo_box_get_device (self->input_device_combo_box);
- cc_profile_combo_box_set_device (self->input_profile_combo_box, self->mixer_control, device);
- gtk_widget_set_visible (GTK_WIDGET (self->input_profile_row),
- cc_profile_combo_box_get_profile_count (self->input_profile_combo_box) > 1);
if (device != NULL)
stream = gvc_mixer_control_get_stream_from_device (self->mixer_control, device);
@@ -154,6 +148,34 @@ input_device_changed_cb (CcSoundPanel *s
}
static void
+output_device_update_cb (CcSoundPanel *self,
+ guint id)
+{
+ GvcMixerUIDevice *device;
+ gboolean has_multi_profiles;
+
+ device = cc_device_combo_box_get_device (self->output_device_combo_box);
+ cc_profile_combo_box_set_device (self->output_profile_combo_box, self->mixer_control, device);
+ has_multi_profiles = (cc_profile_combo_box_get_profile_count (self->output_profile_combo_box) > 1);
+ gtk_widget_set_visible (GTK_WIDGET (self->output_profile_row),
+ has_multi_profiles);
+}
+
+static void
+input_device_update_cb (CcSoundPanel *self,
+ guint id)
+{
+ GvcMixerUIDevice *device;
+ gboolean has_multi_profiles;
+
+ device = cc_device_combo_box_get_device (self->input_device_combo_box);
+ cc_profile_combo_box_set_device (self->input_profile_combo_box, self->mixer_control, device);
+ has_multi_profiles = (cc_profile_combo_box_get_profile_count (self->input_profile_combo_box) > 1);
+ gtk_widget_set_visible (GTK_WIDGET (self->input_profile_row),
+ has_multi_profiles);
+}
+
+static void
test_output_configuration_button_clicked_cb (CcSoundPanel *self)
{
GvcMixerUIDevice *device;
@@ -283,4 +305,14 @@ cc_sound_panel_init (CcSoundPanel *self)
cc_subwoofer_slider_set_mixer_control (self->subwoofer_slider, self->mixer_control);
cc_device_combo_box_set_mixer_control (self->input_device_combo_box, self->mixer_control, FALSE);
cc_device_combo_box_set_mixer_control (self->output_device_combo_box, self->mixer_control, TRUE);
+ g_signal_connect_object (self->mixer_control,
+ "active-output-update",
+ G_CALLBACK (output_device_update_cb),
+ self,
+ G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->mixer_control,
+ "active-input-update",
+ G_CALLBACK (input_device_update_cb),
+ self,
+ G_CONNECT_SWAPPED);
}
meson.build
View file @ cdc476fe
project(
'gnome-control-center', 'c',
version : '3.38.2',
version : '3.38.3',
license : 'GPL2+',
meson_version : '>= 0.51.0'
)
......
panels/display/cc-display-panel.c
View file @ cdc476fe
......@@ -866,6 +866,10 @@ reset_current_config (CcDisplayPanel *panel)
panel->current_output = NULL;
current = cc_display_config_manager_get_current (panel->manager);
if (!current)
return;
cc_display_config_set_minimum_size (current, MINIMUM_WIDTH, MINIMUM_HEIGHT);
panel->current_config = current;
......
panels/network/net-device-wifi.c
View file @ cdc476fe
......@@ -178,7 +178,7 @@ get_secrets_cb (GObject *source_object,
gpointer data)
{
NetDeviceWifi *self = data;
GVariant *secrets;
g_autoptr(GVariant) secrets = NULL;
g_autoptr(GError) error = NULL;
secrets = nm_remote_connection_get_secrets_finish (NM_REMOTE_CONNECTION (source_object), res, &error);
......
panels/printers/pp-new-printer-dialog.c
View file @ cdc476fe
......@@ -1938,8 +1938,8 @@ ppd_selection_cb (GtkDialog *_dialog,
PpNewPrinterDialog *self = user_data;
PpNewPrinter *new_printer;
GList *original_names_list = NULL;
gchar *ppd_name;
gchar *ppd_display_name;
g_autofree gchar *ppd_name = NULL;
g_autofree gchar *ppd_display_name = NULL;
guint window_id = 0;
gint acquisition_method;
......
panels/user-accounts/cc-fingerprint-dialog.c
View file @ cdc476fe
......@@ -1027,7 +1027,7 @@ release_device_cb (GObject *object,
g_dbus_error_strip_remote_error (error);
error_message = g_strdup_printf (_("Failed to release fingerprint device %s: %s"),
cc_fprintd_device_get_name (self->device),
cc_fprintd_device_get_name (fprintd_device),
error->message);
g_warning ("%s", error_message);
......
po/nb.po
View file @ cdc476fe
This diff is collapsed.
po/pt_BR.po
View file @ cdc476fe
This diff is collapsed.