diff options
author | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-07 00:49:01 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-07 00:49:01 +0800 |
commit | 35f3ccfb4d7934dbe3192e9d5e418fe7cb392176 (patch) | |
tree | 6002960fd501559c78475443174d91c5ce0bfa42 /src/empathy-call-window.c | |
parent | 9cd97524aad5e22138407fa59ab4be651fe6468d (diff) | |
download | gsoc2013-empathy-35f3ccfb4d7934dbe3192e9d5e418fe7cb392176.tar gsoc2013-empathy-35f3ccfb4d7934dbe3192e9d5e418fe7cb392176.tar.gz gsoc2013-empathy-35f3ccfb4d7934dbe3192e9d5e418fe7cb392176.tar.bz2 gsoc2013-empathy-35f3ccfb4d7934dbe3192e9d5e418fe7cb392176.tar.lz gsoc2013-empathy-35f3ccfb4d7934dbe3192e9d5e418fe7cb392176.tar.xz gsoc2013-empathy-35f3ccfb4d7934dbe3192e9d5e418fe7cb392176.tar.zst gsoc2013-empathy-35f3ccfb4d7934dbe3192e9d5e418fe7cb392176.zip |
Update empathy_sound_play () to be nicer to use and centralize the list
of sounds we support.
svn path=/trunk/; revision=2082
Diffstat (limited to 'src/empathy-call-window.c')
-rw-r--r-- | src/empathy-call-window.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 4c6777d62..324f37c1e 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -25,7 +25,6 @@ #include <glade/glade.h> #include <glib/gi18n.h> -#include <canberra-gtk.h> #include <telepathy-glib/enums.h> @@ -195,10 +194,9 @@ static void call_window_hang_up_button_clicked_cb (GtkWidget *widget, EmpathyCallWindow *window) { - ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0, - CA_PROP_EVENT_ID, "phone-hangup", - CA_PROP_EVENT_DESCRIPTION, _("Voice call ended"), - NULL); + empathy_sound_play (GTK_WIDGET (window->window), + EMPATHY_SOUND_PHONE_HANGUP); + DEBUG ("Call clicked, end call"); call_window_finalize (window); } @@ -403,19 +401,14 @@ call_window_update (EmpathyCallWindow *window) if (is_incoming) { call_window_show_confirmation_dialog (window); - ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0, - CA_PROP_EVENT_ID, "phone-incoming-call", - CA_PROP_EVENT_DESCRIPTION, _("Incoming voice call"), - NULL); + empathy_sound_play (GTK_WIDGET (window->window), + EMPATHY_SOUND_PHONE_INCOMING); } else { - ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0, - CA_PROP_EVENT_ID, "phone-outgoing-calling", - CA_PROP_EVENT_DESCRIPTION, _("Outgoing voice call"), - NULL); - } - + empathy_sound_play (GTK_WIDGET (window->window), + EMPATHY_SOUND_PHONE_OUTGOING); + } } else if (window->status == EMPATHY_TP_CALL_STATUS_ACCEPTED) { |