diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-30 17:14:33 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-30 17:16:21 +0800 |
| commit | 0dca19234c147a94609c6659660e83135e765b9c (patch) | |
| tree | a65de2c66b618717e085a188f8c3040503e749da /libempathy-gtk | |
| parent | ac0dab19efa8d17f3d7b0c9489a2d3ea06a00c6b (diff) | |
| download | gsoc2013-empathy-0dca19234c147a94609c6659660e83135e765b9c.tar gsoc2013-empathy-0dca19234c147a94609c6659660e83135e765b9c.tar.gz gsoc2013-empathy-0dca19234c147a94609c6659660e83135e765b9c.tar.bz2 gsoc2013-empathy-0dca19234c147a94609c6659660e83135e765b9c.tar.lz gsoc2013-empathy-0dca19234c147a94609c6659660e83135e765b9c.tar.xz gsoc2013-empathy-0dca19234c147a94609c6659660e83135e765b9c.tar.zst gsoc2013-empathy-0dca19234c147a94609c6659660e83135e765b9c.zip | |
move empathy-sound to empathy-sound-manager
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/Makefile.am | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-sound-manager.c (renamed from libempathy-gtk/empathy-sound.c) | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-sound-manager.h (renamed from libempathy-gtk/empathy-sound.h) | 32 |
3 files changed, 20 insertions, 20 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__ */ |