diff options
| author | Stefano Karapetsas <[email protected]> | 2015-03-23 13:57:51 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-03-23 13:57:51 +0100 |
| commit | 8715a80b0f6414bc719646863245aaaade747e88 (patch) | |
| tree | 30566d0d35fe989d2d8a6861a02f01ca2dbbbdc2 | |
| parent | e9c1cd00889e66d249766e0fc3219e19c3722bdc (diff) | |
| parent | 582d6ede5328bef4ebab200c6ea348080e162a3a (diff) | |
| download | mate-media-1.8.tar.bz2 mate-media-1.8.tar.xz | |
Merge pull request #52 from monsta/patch-21.8
[1.8] init vars properly, use safer string compare function
| -rw-r--r-- | mate-volume-control/src/gvc-mixer-control.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mate-volume-control/src/gvc-mixer-control.c b/mate-volume-control/src/gvc-mixer-control.c index 4d69e27..d7882e1 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; } @@ -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++) { |