diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-30 18:24:20 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-30 18:24:20 +0800 |
| commit | 81068bbf3ebd6c251f308d6d45e4dadf07432ea7 (patch) | |
| tree | d17b2afe895a95156d753b6ccbb4b66196cb01b9 /src/empathy-chat-window.c | |
| parent | 8172bca03c6f85d7dcc0ff39f1a81ccfd719b08b (diff) | |
| download | gsoc2013-empathy-81068bbf3ebd6c251f308d6d45e4dadf07432ea7.tar gsoc2013-empathy-81068bbf3ebd6c251f308d6d45e4dadf07432ea7.tar.gz gsoc2013-empathy-81068bbf3ebd6c251f308d6d45e4dadf07432ea7.tar.bz2 gsoc2013-empathy-81068bbf3ebd6c251f308d6d45e4dadf07432ea7.tar.lz gsoc2013-empathy-81068bbf3ebd6c251f308d6d45e4dadf07432ea7.tar.xz gsoc2013-empathy-81068bbf3ebd6c251f308d6d45e4dadf07432ea7.tar.zst gsoc2013-empathy-81068bbf3ebd6c251f308d6d45e4dadf07432ea7.zip | |
move sound functions to EmpathySoundManager methods
Diffstat (limited to 'src/empathy-chat-window.c')
| -rw-r--r-- | src/empathy-chat-window.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 97514e63d..457be5b2d 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -115,6 +115,8 @@ typedef struct { GSettings *gsettings_chat; GSettings *gsettings_notif; GSettings *gsettings_ui; + + EmpathySoundManager *sound_mgr; } EmpathyChatWindowPriv; static GList *chat_windows = NULL; @@ -1402,7 +1404,7 @@ chat_window_new_message_cb (EmpathyChat *chat, sender = empathy_message_get_sender (message); if (empathy_contact_is_user (sender)) { - empathy_sound_play (GTK_WIDGET (priv->dialog), + empathy_sound_manager_play (priv->sound_mgr, GTK_WIDGET (priv->dialog), EMPATHY_SOUND_MESSAGE_OUTGOING); } @@ -1453,7 +1455,7 @@ chat_window_new_message_cb (EmpathyChat *chat, chat_window_set_highlight_room_tab_label (chat); } - empathy_sound_play (GTK_WIDGET (priv->dialog), + empathy_sound_manager_play (priv->sound_mgr, GTK_WIDGET (priv->dialog), EMPATHY_SOUND_MESSAGE_INCOMING); chat_window_show_or_update_notification (window, message, chat); } @@ -1873,6 +1875,7 @@ chat_window_finalize (GObject *object) g_object_unref (priv->gsettings_chat); g_object_unref (priv->gsettings_notif); g_object_unref (priv->gsettings_ui); + g_object_unref (priv->sound_mgr); if (priv->notification != NULL) { notify_notification_close (priv->notification, NULL); @@ -1988,6 +1991,8 @@ empathy_chat_window_init (EmpathyChatWindow *window) priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); + priv->sound_mgr = empathy_sound_manager_dup_singleton (); + priv->notebook = gtk_notebook_new (); g_signal_connect (priv->notebook, "create-window", |