8 files changed, 25 insertions, 25 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index a28ac9a00..7e35929b1 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -75,7 +75,7 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-search-bar.c			\
 	empathy-share-my-desktop.c		\
 	empathy-smiley-manager.c		\
-	empathy-sound.c				\
+	empathy-sound-manager.c			\
 	empathy-spell.c				\
 	empathy-status-preset-dialog.c		\
 	empathy-string-parser.c			\
@@ -137,7 +137,7 @@ libempathy_gtk_headers =			\
 	empathy-search-bar.h			\
 	empathy-share-my-desktop.h		\
 	empathy-smiley-manager.h		\
-	empathy-sound.h				\
+	empathy-sound-manager.h			\
 	empathy-spell.h				\
 	empathy-status-preset-dialog.h		\
 	empathy-string-parser.h			\
diff --git a/libempathy-gtk/empathy-sound.c b/libempathy-gtk/empathy-sound-manager.c
index 03f041916..459016db1 100644
--- a/libempathy-gtk/empathy-sound.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -1,5 +1,5 @@
 /*
- * empathy-sound.c - Various sound related utility functions.
+ * empathy-sound-manager.c - Various sound related utility functions.
  * Copyright (C) 2009 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "empathy-sound.h"
+#include "empathy-sound-manager.h"
 
 #include <canberra-gtk.h>
 #include <glib/gi18n-lib.h>
diff --git a/libempathy-gtk/empathy-sound.h b/libempathy-gtk/empathy-sound-manager.h
index f65f6260e..95160b342 100644
--- a/libempathy-gtk/empathy-sound.h
+++ b/libempathy-gtk/empathy-sound-manager.h
@@ -1,5 +1,5 @@
 /*
- * empathy-sound.h - Various sound related utility functions.
+ * empathy-sound-manager.h - Various sound related utility functions.
  * Copyright (C) 2009 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef __EMPATHY_SOUND_H__
-#define __EMPATHY_SOUND_H__
+#ifndef __EMPATHY_SOUND_MANAGER_H__
+#define __EMPATHY_SOUND_MANAGER_H__
 
 #include <gtk/gtk.h>
 
@@ -27,19 +27,19 @@
 
 G_BEGIN_DECLS
 
-/* NOTE: Keep this sync with sound_entries in empathy-sound.c */
+/* NOTE: Keep this sync with sound_entries in empathy-sound-manager.c */
 typedef enum {
-	EMPATHY_SOUND_MESSAGE_INCOMING = 0,
-	EMPATHY_SOUND_MESSAGE_OUTGOING,
-	EMPATHY_SOUND_CONVERSATION_NEW,
-	EMPATHY_SOUND_CONTACT_CONNECTED,
-	EMPATHY_SOUND_CONTACT_DISCONNECTED,
-	EMPATHY_SOUND_ACCOUNT_CONNECTED,
-	EMPATHY_SOUND_ACCOUNT_DISCONNECTED,
-	EMPATHY_SOUND_PHONE_INCOMING,
-	EMPATHY_SOUND_PHONE_OUTGOING,
-	EMPATHY_SOUND_PHONE_HANGUP,
-	LAST_EMPATHY_SOUND,
+  EMPATHY_SOUND_MESSAGE_INCOMING = 0,
+  EMPATHY_SOUND_MESSAGE_OUTGOING,
+  EMPATHY_SOUND_CONVERSATION_NEW,
+  EMPATHY_SOUND_CONTACT_CONNECTED,
+  EMPATHY_SOUND_CONTACT_DISCONNECTED,
+  EMPATHY_SOUND_ACCOUNT_CONNECTED,
+  EMPATHY_SOUND_ACCOUNT_DISCONNECTED,
+  EMPATHY_SOUND_PHONE_INCOMING,
+  EMPATHY_SOUND_PHONE_OUTGOING,
+  EMPATHY_SOUND_PHONE_HANGUP,
+  LAST_EMPATHY_SOUND,
 } EmpathySound;
 
 gboolean empathy_sound_play (GtkWidget *widget, EmpathySound sound_id);
@@ -53,4 +53,4 @@ gboolean empathy_sound_play_full (GtkWidget *widget, EmpathySound sound_id,
 
 G_END_DECLS
 
-#endif /* #ifndef __EMPATHY_SOUND_H__*/
+#endif /* #ifndef __EMPATHY_SOUND_MANAGER_H__ */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6345358d3..7add53452 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,7 +58,7 @@ libempathy-gtk/empathy-new-call-dialog.c
 libempathy-gtk/empathy-presence-chooser.c
 libempathy-gtk/empathy-protocol-chooser.c
 [type: gettext/glade]libempathy-gtk/empathy-search-bar.ui
-libempathy-gtk/empathy-sound.c
+libempathy-gtk/empathy-sound-manager.c
 libempathy-gtk/empathy-status-preset-dialog.c
 [type: gettext/glade]libempathy-gtk/empathy-status-preset-dialog.ui
 libempathy-gtk/empathy-theme-adium.c
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 00ea56728..4d2d99c27 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -44,7 +44,7 @@
 #include <libempathy-gtk/empathy-audio-sink.h>
 #include <libempathy-gtk/empathy-video-src.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-sound.h>
+#include <libempathy-gtk/empathy-sound-manager.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-images.h>
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6616a18d7..97514e63d 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -51,7 +51,7 @@
 #include <libempathy-gtk/empathy-log-window.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-smiley-manager.h>
-#include <libempathy-gtk/empathy-sound.h>
+#include <libempathy-gtk/empathy-sound-manager.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-notify-manager.h>
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index e40d1c25f..0877c2699 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -43,7 +43,7 @@
 
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-contact-dialogs.h>
-#include <libempathy-gtk/empathy-sound.h>
+#include <libempathy-gtk/empathy-sound-manager.h>
 
 #include "empathy-event-manager.h"
 #include "empathy-main-window.h"
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index cdf0deddb..8b9661838 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -60,7 +60,7 @@
 #include <libempathy-gtk/empathy-new-call-dialog.h>
 #include <libempathy-gtk/empathy-log-window.h>
 #include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-sound.h>
+#include <libempathy-gtk/empathy-sound-manager.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-accounts-dialog.h"