summaryrefslogtreecommitdiff
path: root/capplets/sound
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2008-08-21 16:04:15 +0000
committerJens Granseuer <jensg@src.gnome.org>2008-08-21 16:04:15 +0000
commita4312299437b9bb357e04f69933cd96ed43368db (patch)
tree6b998bac824231457ab600f803d8a1da79349e80 /capplets/sound
parentb15552fdd9ecfdb50fc5e8f32b5d7897cd730a5d (diff)
downloadgnome-control-center-a4312299437b9bb357e04f69933cd96ed43368db.tar.gz
Patch by: Brian Cameron <brian.cameron@sun.com>
2008-08-21 Jens Granseuer <jensgr@gmx.net> Patch by: Brian Cameron <brian.cameron@sun.com> * sound-theme.c: (set_combox_for_theme_name): trying to print NULL strings crashes on Solaris (bug #548586) svn path=/trunk/; revision=8878
Diffstat (limited to 'capplets/sound')
-rw-r--r--capplets/sound/ChangeLog7
-rw-r--r--capplets/sound/sound-theme.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 04fbff5df..cfad1d298 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-21 Jens Granseuer <jensgr@gmx.net>
+
+ Patch by: Brian Cameron <brian.cameron@sun.com>
+
+ * sound-theme.c: (set_combox_for_theme_name): trying to print NULL
+ strings crashes on Solaris (bug #548586)
+
2008-08-16 Jens Granseuer <jensgr@gmx.net>
Patch by: Matthias Clasen <mclasen@redhat.com>
diff --git a/capplets/sound/sound-theme.c b/capplets/sound/sound-theme.c
index e5d9cbf69..4737e9fd1 100644
--- a/capplets/sound/sound-theme.c
+++ b/capplets/sound/sound-theme.c
@@ -227,7 +227,7 @@ set_combox_for_theme_name (GladeXML *dialog, const char *name)
GtkTreeModel *model;
gboolean found;
- g_debug ("setting theme %s", name);
+ g_debug ("setting theme %s", name ? name : "(null)");
/* If the name is empty, use "freedesktop" */
if (name == NULL || *name == '\0')