Turn empathy_sound_pref_is_enabled into empathy_sound_play that

automatically plays the sound if the pref is enabled.

svn path=/trunk/; revision=2078

2 files changed, 23 insertions, 44 deletions

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index e1bd9075e..2c97301a5 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -33,7 +33,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
-#include <canberra-gtk.h>
 
 #include <telepathy-glib/util.h>
 #include <libmissioncontrol/mission-control.h>
@@ -858,19 +857,14 @@ chat_window_new_message_cb (EmpathyChat       *chat,
 	sender = empathy_message_get_sender (message);
 
 	if (empathy_contact_is_user (sender) != FALSE) {
-		if (empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_OUTGOING_MESSAGE)) {
-			ca_gtk_play_for_widget (GTK_WIDGET (priv->dialog), 0,
-						CA_PROP_EVENT_ID, "message-sent-instant",
-			                        CA_PROP_EVENT_DESCRIPTION, _("Sent an instant message"),
-			                        NULL);
-		}
+		empathy_sound_play (GTK_WIDGET (priv->dialog),
+				    EMPATHY_PREFS_SOUNDS_OUTGOING_MESSAGE,
+				    "message-sent-instant", _("Sent an instant message"));
 	} else {
-		if ((!has_focus || priv->current_chat != chat) &&
-		    empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE)) {
-			ca_gtk_play_for_widget (GTK_WIDGET (priv->dialog), 0,
-			                        CA_PROP_EVENT_ID, "message-new-instant",
-			                        CA_PROP_EVENT_DESCRIPTION, _("Received an instant message"),
-			                        NULL);
+		if ((!has_focus || priv->current_chat != chat)) {
+			empathy_sound_play (GTK_WIDGET (priv->dialog),
+					    EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE,
+					    "message-new-instant", _("Received an instant message"));
 		}
 	}
 
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 8a377d794..b95783f3a 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
-#include <canberra-gtk.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-utils.h>
@@ -284,12 +283,9 @@ main_window_flash_cb (EmpathyMainWindow *window)
 static void
 main_window_flash_start (EmpathyMainWindow *window)
 {
-	if (empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION)) {
-		ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0,
-					CA_PROP_EVENT_ID, "message-new-instant",
-					CA_PROP_EVENT_DESCRIPTION, _("Incoming chat request"),
-					NULL);
-	}
+	empathy_sound_play (GTK_WIDGET (window->window),
+			    EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION,
+			    "message-new-instant", _("Incoming chat request"));
 
 	if (window->flash_timeout_id != 0) {
 		return;
@@ -433,23 +429,18 @@ main_window_connection_changed_cb (EmpathyAccountManager *manager,
 		main_window_error_display (window, account, message);
 	}
 
-	if (current == TP_CONNECTION_STATUS_DISCONNECTED &&
-	    empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT)) {
-		ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0,
-		                        CA_PROP_EVENT_ID, "service-logout",
-		                        CA_PROP_EVENT_DESCRIPTION, _("Disconnected from server"),
-		                        NULL);
+	if (current == TP_CONNECTION_STATUS_DISCONNECTED) {
+		empathy_sound_play (GTK_WIDGET (window->window),
+				    EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT,
+				    "service-logout", _("Disconnected from server"));
 	}
 
 	if (current == TP_CONNECTION_STATUS_CONNECTED) {
 		GtkWidget *error_widget;
 
-		if (empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN)) {
-			ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0,
-						CA_PROP_EVENT_ID, "service-login",
-						CA_PROP_EVENT_DESCRIPTION, _("Connected to server"),
-						NULL);
-		}
+		empathy_sound_play (GTK_WIDGET (window->window),
+				    EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN,
+				    "service-login", _("Connected to server"));
 
 		/* Account connected without error, remove error message if any */
 		error_widget = g_hash_table_lookup (window->errors, account);
@@ -479,23 +470,17 @@ main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor,
 
 	if (previous < MC_PRESENCE_AVAILABLE && current > MC_PRESENCE_OFFLINE) {
 		/* someone is logging in */
-		if (empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN)) {
-			ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0,
-						CA_PROP_EVENT_ID, "service-login",
-						CA_PROP_EVENT_DESCRIPTION, _("Contact logged in"),
-						NULL);
-		}
+		empathy_sound_play (GTK_WIDGET (window->window),
+				    EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN,
+				    "service-login", _("Contact logged in"));
 		return;
 	}
 
 	if (previous > MC_PRESENCE_OFFLINE && current < MC_PRESENCE_AVAILABLE) {
 		/* someone is logging off */
-		if (empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT)) {
-			ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0,
-						CA_PROP_EVENT_ID, "service-logout",
-						CA_PROP_EVENT_DESCRIPTION, _("Contact logged out"),
-						NULL);
-		}
+		empathy_sound_play (GTK_WIDGET (window->window),
+				    EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT,
+				    "service-logout", _("Contact logged out"));
 	}
 }