diff options
Diffstat (limited to 'libempathy-gtk/empathy-ui-utils.c')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index d7d314082..91362da5e 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1584,23 +1584,6 @@ static EmpathySoundEntry sound_entries[LAST_EMPATHY_SOUND] = { N_("Voice call ended"), NULL }, }; -static gboolean -check_available (void) -{ - McPresence presence; - EmpathyIdle *idle; - - idle = empathy_idle_dup_singleton (); - presence = empathy_idle_get_state (idle); - g_object_unref (idle); - - if (presence != MC_PRESENCE_AVAILABLE && - presence != MC_PRESENCE_UNSET) { - return FALSE; - } - - return TRUE; -} static gboolean empathy_sound_pref_is_enabled (const char *key) @@ -1617,7 +1600,7 @@ empathy_sound_pref_is_enabled (const char *key) return FALSE; } - if (!check_available ()) { + if (!empathy_check_available_state ()) { empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_DISABLED_AWAY, &res); if (res) { @@ -1658,36 +1641,3 @@ empathy_sound_play (GtkWidget *widget, } } -gboolean -empathy_notification_should_show (gboolean check_focus) -{ - EmpathyConf *conf; - gboolean res; - - conf = empathy_conf_get (); - res = FALSE; - - empathy_conf_get_bool (conf, EMPATHY_PREFS_NOTIFICATIONS_ENABLED, &res); - - if (!res) { - return FALSE; - } - - if (!check_available ()) { - empathy_conf_get_bool (conf, - EMPATHY_PREFS_NOTIFICATIONS_DISABLED_AWAY, - &res); - if (res) { - return FALSE; - } - } - - if (check_focus) { - empathy_conf_get_bool (conf, - EMPATHY_PREFS_NOTIFICATIONS_FOCUS, &res); - return res; - } else { - return TRUE; - } -} - |