aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2009-01-07 00:46:07 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-07 00:46:07 +0800
commitca2a03e84bd231e8e9c8522f42778493c977a478 (patch)
treec14f9df6e74ed26e9019aaa03ec7755fbb29ad10 /libempathy-gtk
parent7b293aff4cbfa6f28b906d72605813c40b7b0ed6 (diff)
downloadgsoc2013-empathy-ca2a03e84bd231e8e9c8522f42778493c977a478.tar
gsoc2013-empathy-ca2a03e84bd231e8e9c8522f42778493c977a478.tar.gz
gsoc2013-empathy-ca2a03e84bd231e8e9c8522f42778493c977a478.tar.bz2
gsoc2013-empathy-ca2a03e84bd231e8e9c8522f42778493c977a478.tar.lz
gsoc2013-empathy-ca2a03e84bd231e8e9c8522f42778493c977a478.tar.xz
gsoc2013-empathy-ca2a03e84bd231e8e9c8522f42778493c977a478.tar.zst
gsoc2013-empathy-ca2a03e84bd231e8e9c8522f42778493c977a478.zip
Don't emit sound when changing state and properly play login sound.
svn path=/trunk/; revision=2027
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-ui-utils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index a7a468c3f..83141afbf 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1509,11 +1509,13 @@ empathy_sound_pref_is_enabled (const char *key)
return FALSE;
}
- idle = empathy_idle_new ();
+ idle = empathy_idle_new ();
presence = empathy_idle_get_state (idle);
g_object_unref (idle);
- if (presence > MC_PRESENCE_AVAILABLE) {
+
+ if (presence != MC_PRESENCE_AVAILABLE &&
+ presence != MC_PRESENCE_UNSET) {
empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_DISABLED_AWAY,
&res);
if (res) {