5 files changed, 9 insertions, 7 deletions
diff --git a/mate-volume-control/gvc-balance-bar.c b/mate-volume-control/gvc-balance-bar.c
index e4fccb8..3e28345 100644
--- a/mate-volume-control/gvc-balance-bar.c
+++ b/mate-volume-control/gvc-balance-bar.c
@@ -242,7 +242,7 @@ find_stream_lfe_channel (MateMixerStreamControl *control)
 static void
 gvc_balance_bar_set_control (GvcBalanceBar *bar, MateMixerStreamControl *control)
 {
- g_return_if_fail (GVC_BALANCE_BAR (bar));
+ g_return_if_fail (GVC_IS_BALANCE_BAR (bar));
 g_return_if_fail (MATE_MIXER_IS_STREAM_CONTROL (control));
 
 if (bar->priv->control != NULL) {
diff --git a/mate-volume-control/gvc-level-bar.c b/mate-volume-control/gvc-level-bar.c
index 0d815fc..24ac1f2 100644
--- a/mate-volume-control/gvc-level-bar.c
+++ b/mate-volume-control/gvc-level-bar.c
@@ -295,7 +295,7 @@ void
 gvc_level_bar_set_peak_adjustment (GvcLevelBar *bar,
 GtkAdjustment *adjustment)
 {
- g_return_if_fail (GVC_LEVEL_BAR (bar));
+ g_return_if_fail (GVC_IS_LEVEL_BAR (bar));
 g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
 if (bar->priv->peak_adjustment != NULL) {
@@ -321,7 +321,7 @@ void
 gvc_level_bar_set_rms_adjustment (GvcLevelBar *bar,
 GtkAdjustment *adjustment)
 {
- g_return_if_fail (GVC_LEVEL_BAR (bar));
+ g_return_if_fail (GVC_IS_LEVEL_BAR (bar));
 g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
 if (bar->priv->rms_adjustment != NULL) {
diff --git a/mate-volume-control/gvc-sound-theme-chooser.c b/mate-volume-control/gvc-sound-theme-chooser.c
index 7225888..ef526d0 100644
--- a/mate-volume-control/gvc-sound-theme-chooser.c
+++ b/mate-volume-control/gvc-sound-theme-chooser.c
@@ -35,6 +35,7 @@
 #include <gtk/gtk.h>
 #include <canberra-gtk.h>
 #include <libxml/tree.h>
+#include <libxml/parser.h>
 
 #include "gvc-sound-theme-chooser.h"
 #include "sound-theme-file-utils.h"
diff --git a/mate-volume-control/gvc-stream-applet-icon.c b/mate-volume-control/gvc-stream-applet-icon.c
index 99a32fa..7c1bdb5 100644
--- a/mate-volume-control/gvc-stream-applet-icon.c
+++ b/mate-volume-control/gvc-stream-applet-icon.c
@@ -497,7 +497,7 @@ void
 gvc_stream_applet_icon_set_display_name (GvcStreamAppletIcon *icon,
 const gchar *name)
 {
- g_return_if_fail (GVC_STREAM_APPLET_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_APPLET_ICON (icon));
 
 g_free (icon->priv->display_name);
 
@@ -511,7 +511,7 @@ void
 gvc_stream_applet_icon_set_control (GvcStreamAppletIcon *icon,
 MateMixerStreamControl *control)
 {
- g_return_if_fail (GVC_STREAM_APPLET_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_APPLET_ICON (icon));
 
 if (icon->priv->control == control)
 return;
@@ -763,6 +763,7 @@ gvc_stream_applet_icon_finalize (GObject *object)
 icon = GVC_STREAM_APPLET_ICON (object);
 
 g_strfreev (icon->priv->icon_names);
+ g_clear_pointer (&icon->priv->display_name, g_free);
 
 g_signal_handlers_disconnect_by_func (gtk_settings_get_default (),
 on_icon_theme_change,
diff --git a/mate-volume-control/gvc-stream-status-icon.c b/mate-volume-control/gvc-stream-status-icon.c
index 8ca2849..aac39ba 100644
--- a/mate-volume-control/gvc-stream-status-icon.c
+++ b/mate-volume-control/gvc-stream-status-icon.c
@@ -508,7 +508,7 @@ void
 gvc_stream_status_icon_set_display_name (GvcStreamStatusIcon *icon,
 const gchar *name)
 {
- g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_STATUS_ICON (icon));
 
 g_free (icon->priv->display_name);
 
@@ -522,7 +522,7 @@ void
 gvc_stream_status_icon_set_control (GvcStreamStatusIcon *icon,
 MateMixerStreamControl *control)
 {
- g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
+ g_return_if_fail (GVC_IS_STREAM_STATUS_ICON (icon));
 
 if (icon->priv->control == control)
 return;