diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-09-03 00:02:30 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-09-03 00:02:30 +0200 |
| commit | 0c1f6a8612d683fe9ba73749e4f624420bd231d4 (patch) | |
| tree | 4d69ee63662413f671a799bb45b3e1892ab6143e /src/canberra-gtk.c | |
| parent | c62c827a061bc3a2a191802a3f0e7726c88c4468 (diff) | |
| parent | 6ac713466c207ce8253410d1598f5f37e509acc2 (diff) | |
Merge commit 'elmarco/upstream-master'
Diffstat (limited to 'src/canberra-gtk.c')
| -rw-r--r-- | src/canberra-gtk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c index 66a2b9a..d3be082 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -101,6 +101,8 @@ ca_context *ca_gtk_context_get(void) { s = gtk_settings_get_default(); + ca_return_val_if_fail(s, NULL); + if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-sound-theme-name")) { g_signal_connect(G_OBJECT(s), "notify::gtk-sound-theme-name", G_CALLBACK(sound_theme_name_changed), c); read_sound_theme_name(c, s); |