aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Barisione <marco.barisione@collabora.co.uk>2013-05-10 00:10:17 +0800
committerMarco Barisione <marco.barisione@collabora.co.uk>2013-08-20 18:03:06 +0800
commit431c21692c396b39764eca31c3c4f05f4507ce59 (patch)
treea9f8fc0fa9ca7ee6255df908f9f1ef2059ac5875 /src
parentfad2ecd3f071c671425954638081c641ff603503 (diff)
downloadgsoc2013-empathy-431c21692c396b39764eca31c3c4f05f4507ce59.tar
gsoc2013-empathy-431c21692c396b39764eca31c3c4f05f4507ce59.tar.gz
gsoc2013-empathy-431c21692c396b39764eca31c3c4f05f4507ce59.tar.bz2
gsoc2013-empathy-431c21692c396b39764eca31c3c4f05f4507ce59.tar.lz
gsoc2013-empathy-431c21692c396b39764eca31c3c4f05f4507ce59.tar.xz
gsoc2013-empathy-431c21692c396b39764eca31c3c4f05f4507ce59.tar.zst
gsoc2013-empathy-431c21692c396b39764eca31c3c4f05f4507ce59.zip
tpaw-utils: move empathy_implement_finish_* to tp-aw and rename them
All the code was initially written for wocky which is under LGPL. https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'src')
-rw-r--r--src/empathy-audio-src.c4
-rw-r--r--src/empathy-mic-monitor.c7
2 files changed, 7 insertions, 4 deletions
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index bc3aa50cd..fcca6621d 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -21,6 +21,8 @@
#include "config.h"
#include "empathy-audio-src.h"
+#include <tp-account-widgets/tpaw-utils.h>
+
#ifdef HAVE_GST1
#include <gst/audio/streamvolume.h>
#else
@@ -623,7 +625,7 @@ empathy_audio_src_change_microphone_finish (EmpathyGstAudioSrc *src,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (src,
+ tpaw_implement_finish_void (src,
empathy_audio_src_change_microphone_async);
}
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index ae2b0c071..a97f70e0d 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -21,6 +21,7 @@
#include "empathy-mic-monitor.h"
#include <pulse/glib-mainloop.h>
+#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-utils.h"
@@ -475,7 +476,7 @@ empathy_mic_monitor_change_microphone_finish (EmpathyMicMonitor *self,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (self,
+ tpaw_implement_finish_void (self,
empathy_mic_monitor_change_microphone_async);
}
@@ -613,7 +614,7 @@ empathy_mic_monitor_get_default_finish (EmpathyMicMonitor *self,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_return_pointer (self,
+ tpaw_implement_finish_return_pointer (self,
empathy_mic_monitor_get_default_async);
}
@@ -677,6 +678,6 @@ empathy_mic_monitor_set_default_finish (EmpathyMicMonitor *self,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (self,
+ tpaw_implement_finish_void (self,
empathy_mic_monitor_set_default_async);
}