Commit 65cd28e2 authored by Simon McVittie's avatar Simon McVittie
Browse files

New upstream version 3.38.1

parents d4776139 46076680
==============
Version 3.38.1
==============
Sound:
- Update g-v-c dependency. Necessary to support related UCM
changes in ALSA and Pulseaudio
Media-keys:
- Don't throw unnecessary warnings
Print-notification:
- Disable plugin if CUPS is diabled
- Translation updates
==============
Version 3.38.0
==============
......
project(
'gnome-settings-daemon', 'c',
version: '3.38.0',
version: '3.38.1',
license: [ 'GPL2+', 'LGPLv2+' ],
meson_version: '>= 0.47.0'
)
......
......@@ -1622,7 +1622,8 @@ do_sound_action (GsdMediaKeysManager *manager,
}
static void
update_default_sink (GsdMediaKeysManager *manager)
update_default_sink (GsdMediaKeysManager *manager,
gboolean warn)
{
GsdMediaKeysManagerPrivate *priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
GvcMixerStream *stream;
......@@ -1636,12 +1637,16 @@ update_default_sink (GsdMediaKeysManager *manager)
if (stream != NULL) {
priv->sink = g_object_ref (stream);
} else {
g_warning ("Unable to get default sink");
if (warn)
g_warning ("Unable to get default sink");
else
g_debug ("Unable to get default sink");
}
}
static void
update_default_source (GsdMediaKeysManager *manager)
update_default_source (GsdMediaKeysManager *manager,
gboolean warn)
{
GsdMediaKeysManagerPrivate *priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
GvcMixerStream *stream;
......@@ -1655,7 +1660,10 @@ update_default_source (GsdMediaKeysManager *manager)
if (stream != NULL) {
priv->source = g_object_ref (stream);
} else {
g_warning ("Unable to get default source");
if (warn)
g_warning ("Unable to get default source");
else
g_debug ("Unable to get default source");
}
}
......@@ -1664,8 +1672,8 @@ on_control_state_changed (GvcMixerControl *control,
GvcMixerControlState new_state,
GsdMediaKeysManager *manager)
{
update_default_sink (manager);
update_default_source (manager);
update_default_sink (manager, new_state == GVC_STATE_READY);
update_default_source (manager, new_state == GVC_STATE_READY);
}
static void
......@@ -1673,7 +1681,7 @@ on_control_default_sink_changed (GvcMixerControl *control,
guint id,
GsdMediaKeysManager *manager)
{
update_default_sink (manager);
update_default_sink (manager, TRUE);
}
static void
......@@ -1681,7 +1689,7 @@ on_control_default_source_changed (GvcMixerControl *control,
guint id,
GsdMediaKeysManager *manager)
{
update_default_source (manager);
update_default_source (manager, TRUE);
}
#if HAVE_GUDEV
......
......@@ -48,6 +48,10 @@ if not enable_colord
disabled_plugins += ['color']
endif
if not enable_cups
disabled_plugins += ['print-notifications']
endif
# Specify futher required units, 'before' or 'after' may be specified if ordering is needed
plugin_gate_units = {
'xsettings': [
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -55,7 +55,7 @@ libgvc_no_gir_sources = [
libgvc_deps = [
dependency('gio-2.0'),
dependency('gobject-2.0'),
dependency('libpulse', version: '>= 2.0'),
dependency('libpulse', version: '>= 12.99.3'),
dependency('libpulse-mainloop-glib')
]
......
......@@ -8,7 +8,7 @@
typedef struct {
GvcHeadsetPortChoice choice;
gchar *name;
const char *name;
} AudioSelectionChoice;
static AudioSelectionChoice audio_selection_choices[] = {
......@@ -24,7 +24,7 @@ audio_selection_needed (GvcMixerControl *volume,
GvcHeadsetPortChoice choices,
gpointer user_data)
{
char *args[G_N_ELEMENTS (audio_selection_choices) + 1];
const char *args[G_N_ELEMENTS (audio_selection_choices) + 1];
guint i, n;
int response = -1;
......@@ -51,7 +51,7 @@ audio_selection_needed (GvcMixerControl *volume,
g_print ("What is your choice?\n");
if (scanf ("%d", &res) == 1 &&
res > 0 &&
res < g_strv_length (args)) {
res < (int) g_strv_length ((char **) args)) {
response = res;
break;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment