aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-ui-utils.c
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2009-01-07 00:46:07 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2009-01-07 00:46:07 +0800
commitf1c05d4d46f0c22cd50bed1e357ad739dbc682ef (patch)
treec14f9df6e74ed26e9019aaa03ec7755fbb29ad10 /libempathy-gtk/empathy-ui-utils.c
parente3f88066b68a99a7dc475dd1aa83d186c3ca0e53 (diff)
downloadgsoc2013-empathy-f1c05d4d46f0c22cd50bed1e357ad739dbc682ef.tar
gsoc2013-empathy-f1c05d4d46f0c22cd50bed1e357ad739dbc682ef.tar.gz
gsoc2013-empathy-f1c05d4d46f0c22cd50bed1e357ad739dbc682ef.tar.bz2
gsoc2013-empathy-f1c05d4d46f0c22cd50bed1e357ad739dbc682ef.tar.lz
gsoc2013-empathy-f1c05d4d46f0c22cd50bed1e357ad739dbc682ef.tar.xz
gsoc2013-empathy-f1c05d4d46f0c22cd50bed1e357ad739dbc682ef.tar.zst
gsoc2013-empathy-f1c05d4d46f0c22cd50bed1e357ad739dbc682ef.zip
Don't emit sound when changing state and properly play login sound.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2027 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy-gtk/empathy-ui-utils.c')
-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) {