[gnome-control-center] sound: Avoid second warning when no theme

[Bastien Nocera <hadess src gnome org>]

commit adc34ac019fead968d0a5e391615c003d26ed759
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Nov 18 15:20:23 2010 +0000

    sound: Avoid second warning when no theme
    
    When the freedesktop sound theme isn't installed, avoid warnings
    on startup above and beyond the existing one.

 panels/sound/gvc-level-bar.c           |    2 ++
 panels/sound/gvc-sound-theme-chooser.c |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/panels/sound/gvc-level-bar.c b/panels/sound/gvc-level-bar.c
index 519fcc8..75c7cb0 100644
--- a/panels/sound/gvc-level-bar.c
+++ b/panels/sound/gvc-level-bar.c
@@ -573,6 +573,8 @@ gvc_level_bar_draw (GtkWidget *widget,
 
         g_return_val_if_fail (GVC_IS_LEVEL_BAR (widget), FALSE);
 
+        g_message ("gvc_level_bar_draw");
+
         bar = GVC_LEVEL_BAR (widget);
 
         gtk_widget_get_allocation (widget, &allocation);
diff --git a/panels/sound/gvc-sound-theme-chooser.c b/panels/sound/gvc-sound-theme-chooser.c
index 676c510..3262108 100644
--- a/panels/sound/gvc-sound-theme-chooser.c
+++ b/panels/sound/gvc-sound-theme-chooser.c
@@ -237,6 +237,11 @@ set_combox_for_theme_name (GvcSoundThemeChooser *chooser,
         }
 
         model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser->priv->combo_box));
+        if (model == NULL) {
+                /* No theme was installed, don't warn again
+                 * See setup_theme_selector() */
+                return;
+        }
 
         if (gtk_tree_model_get_iter_first (model, &iter) == FALSE) {
                 return;