From be848eb10a716df13bf4dc6af9239b4e4143623c Mon Sep 17 00:00:00 2001 From: monsta Date: Sat, 1 Nov 2014 23:24:45 +0300 Subject: init vars properly, use safer string compare function g_strcmp0 on two NULLs gives 0, so the logic is preserved here --- mate-volume-control/src/gvc-mixer-control.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mate-volume-control/src/gvc-mixer-control.c b/mate-volume-control/src/gvc-mixer-control.c index 4d69e27..e587c8f 100644 --- a/mate-volume-control/src/gvc-mixer-control.c +++ b/mate-volume-control/src/gvc-mixer-control.c @@ -533,13 +533,13 @@ static void update_default_source_from_name (GvcMixerControl *control, const char *name) { - gboolean changed; + gboolean changed = FALSE; if ((control->priv->default_source_name == NULL && name != NULL) || (control->priv->default_source_name != NULL && name == NULL) - || strcmp (control->priv->default_source_name, name) != 0) { + || g_strcmp0 (control->priv->default_source_name, name) != 0) { changed = TRUE; } @@ -558,13 +558,13 @@ static void update_default_sink_from_name (GvcMixerControl *control, const char *name) { - gboolean changed; + gboolean changed = FALSE; if ((control->priv->default_sink_name == NULL && name != NULL) || (control->priv->default_sink_name != NULL && name == NULL) - || strcmp (control->priv->default_sink_name, name) != 0) { + || g_strcmp0 (control->priv->default_sink_name, name) != 0) { changed = TRUE; } -- cgit v1.2.1 From 582d6ede5328bef4ebab200c6ea348080e162a3a Mon Sep 17 00:00:00 2001 From: monsta Date: Sat, 1 Nov 2014 23:42:55 +0300 Subject: init var properly, fix a typo --- mate-volume-control/src/gvc-mixer-control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mate-volume-control/src/gvc-mixer-control.c b/mate-volume-control/src/gvc-mixer-control.c index e587c8f..d7882e1 100644 --- a/mate-volume-control/src/gvc-mixer-control.c +++ b/mate-volume-control/src/gvc-mixer-control.c @@ -1039,13 +1039,13 @@ update_card (GvcMixerControl *control, const pa_card_info *info) { GvcMixerCard *card; - gboolean is_new; + gboolean is_new = FALSE; #if 1 guint i; const char *key; void *state; - g_debug ("Udpating card %s (index: %u driver: %s):", + g_debug ("Updating card %s (index: %u driver: %s):", info->name, info->index, info->driver); for (i = 0; i < info->n_profiles; i++) { -- cgit v1.2.1