summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libempathy/empathy-client-factory.c4
-rw-r--r--libempathy/empathy-individual-manager.c4
-rw-r--r--libempathy/empathy-sasl-mechanisms.c3
-rw-r--r--libempathy/empathy-utils.h45
-rw-r--r--src/empathy-audio-src.c4
-rw-r--r--src/empathy-mic-monitor.c7
-rw-r--r--tp-account-widgets/tpaw-avatar-chooser.c3
-rw-r--r--tp-account-widgets/tpaw-keyring.c11
-rw-r--r--tp-account-widgets/tpaw-user-info.c3
-rw-r--r--tp-account-widgets/tpaw-utils.h45
10 files changed, 70 insertions, 59 deletions
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 39760998..e82b8620 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -22,6 +22,8 @@
#include "config.h"
#include "empathy-client-factory.h"
+#include <tp-account-widgets/tpaw-utils.h>
+
#include "empathy-tp-chat.h"
#include "empathy-utils.h"
@@ -274,6 +276,6 @@ empathy_client_factory_dup_contact_by_id_finish (
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_return_copy_pointer (self,
+ tpaw_implement_finish_return_copy_pointer (self,
empathy_client_factory_dup_contact_by_id_async, g_object_ref);
}
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 71960b5d..85189853 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -23,6 +23,8 @@
#include "config.h"
#include "empathy-individual-manager.h"
+#include <tp-account-widgets/tpaw-utils.h>
+
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -946,6 +948,6 @@ empathy_individual_manager_unprepare_finish (
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (self,
+ tpaw_implement_finish_void (self,
empathy_individual_manager_unprepare_async)
}
diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c
index a6829c45..75a924f0 100644
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -22,6 +22,7 @@
#include "empathy-sasl-mechanisms.h"
#include <libsoup/soup.h>
+#include <tp-account-widgets/tpaw-utils.h>
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
@@ -336,7 +337,7 @@ empathy_sasl_auth_finish (TpChannel *channel,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (channel, empathy_sasl_auth_common_async);
+ tpaw_implement_finish_void (channel, empathy_sasl_auth_common_async);
}
gboolean
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index fe194bdc..c6208324 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -120,51 +120,6 @@ GVariant * empathy_boxed_to_variant (GType gtype,
const gchar *variant_type,
gpointer boxed);
-/* Copied from wocky/wocky-utils.h */
-
-#define empathy_implement_finish_void(source, tag) \
- if (g_simple_async_result_propagate_error (\
- G_SIMPLE_ASYNC_RESULT (result), error)) \
- return FALSE; \
- g_return_val_if_fail (g_simple_async_result_is_valid (result, \
- G_OBJECT(source), tag), \
- FALSE); \
- return TRUE;
-
-#define empathy_implement_finish_copy_pointer(source, tag, copy_func, \
- out_param) \
- GSimpleAsyncResult *_simple; \
- _simple = (GSimpleAsyncResult *) result; \
- if (g_simple_async_result_propagate_error (_simple, error)) \
- return FALSE; \
- g_return_val_if_fail (g_simple_async_result_is_valid (result, \
- G_OBJECT (source), tag), \
- FALSE); \
- if (out_param != NULL) \
- *out_param = copy_func ( \
- g_simple_async_result_get_op_res_gpointer (_simple)); \
- return TRUE;
-
-#define empathy_implement_finish_return_copy_pointer(source, tag, copy_func) \
- GSimpleAsyncResult *_simple; \
- _simple = (GSimpleAsyncResult *) result; \
- if (g_simple_async_result_propagate_error (_simple, error)) \
- return NULL; \
- g_return_val_if_fail (g_simple_async_result_is_valid (result, \
- G_OBJECT (source), tag), \
- NULL); \
- return copy_func (g_simple_async_result_get_op_res_gpointer (_simple));
-
-#define empathy_implement_finish_return_pointer(source, tag) \
- GSimpleAsyncResult *_simple; \
- _simple = (GSimpleAsyncResult *) result; \
- if (g_simple_async_result_propagate_error (_simple, error)) \
- return NULL; \
- g_return_val_if_fail (g_simple_async_result_is_valid (result, \
- G_OBJECT (source), tag), \
- NULL); \
- return g_simple_async_result_get_op_res_gpointer (_simple);
-
G_END_DECLS
#endif /* __EMPATHY_UTILS_H__ */
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index bc3aa50c..fcca6621 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 ae2b0c07..a97f70e0 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);
}
diff --git a/tp-account-widgets/tpaw-avatar-chooser.c b/tp-account-widgets/tpaw-avatar-chooser.c
index 7d28c421..6813cb67 100644
--- a/tp-account-widgets/tpaw-avatar-chooser.c
+++ b/tp-account-widgets/tpaw-avatar-chooser.c
@@ -27,6 +27,7 @@
#include <tp-account-widgets/tpaw-camera-monitor.h>
#include <tp-account-widgets/tpaw-gsettings.h>
#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-utils.h>
#ifdef HAVE_CHEESE
#include <cheese-avatar-chooser.h>
@@ -1218,5 +1219,5 @@ tpaw_avatar_chooser_apply_finish (TpawAvatarChooser *self,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (self, tpaw_avatar_chooser_apply_async);
+ tpaw_implement_finish_void (self, tpaw_avatar_chooser_apply_async);
}
diff --git a/tp-account-widgets/tpaw-keyring.c b/tp-account-widgets/tpaw-keyring.c
index 94bbd93e..0de6f8b5 100644
--- a/tp-account-widgets/tpaw-keyring.c
+++ b/tp-account-widgets/tpaw-keyring.c
@@ -33,6 +33,7 @@
#endif
#include "empathy-utils.h"
+#include "tpaw-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
@@ -324,7 +325,7 @@ tpaw_keyring_get_account_password_finish (TpAccount *account,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_return_pointer (account,
+ tpaw_implement_finish_return_pointer (account,
tpaw_keyring_get_account_password_async);
}
@@ -333,7 +334,7 @@ tpaw_keyring_get_room_password_finish (TpAccount *account,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_return_pointer (account,
+ tpaw_implement_finish_return_pointer (account,
tpaw_keyring_get_room_password_async);
}
@@ -637,7 +638,7 @@ tpaw_keyring_set_account_password_finish (TpAccount *account,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (account, tpaw_keyring_set_account_password_async);
+ tpaw_implement_finish_void (account, tpaw_keyring_set_account_password_async);
}
gboolean
@@ -645,7 +646,7 @@ tpaw_keyring_set_room_password_finish (TpAccount *account,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (account, tpaw_keyring_set_room_password_async);
+ tpaw_implement_finish_void (account, tpaw_keyring_set_room_password_async);
}
/* delete */
@@ -716,5 +717,5 @@ tpaw_keyring_delete_account_password_finish (TpAccount *account,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (account, tpaw_keyring_delete_account_password_async);
+ tpaw_implement_finish_void (account, tpaw_keyring_delete_account_password_async);
}
diff --git a/tp-account-widgets/tpaw-user-info.c b/tp-account-widgets/tpaw-user-info.c
index 9a4843fe..5dddd88a 100644
--- a/tp-account-widgets/tpaw-user-info.c
+++ b/tp-account-widgets/tpaw-user-info.c
@@ -25,6 +25,7 @@
#include <tp-account-widgets/tpaw-calendar-button.h>
#include <tp-account-widgets/tpaw-contactinfo-utils.h>
#include <tp-account-widgets/tpaw-time.h>
+#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-utils.h"
@@ -772,5 +773,5 @@ tpaw_user_info_apply_finish (TpawUserInfo *self,
GAsyncResult *result,
GError **error)
{
- empathy_implement_finish_void (self, tpaw_user_info_apply_async);
+ tpaw_implement_finish_void (self, tpaw_user_info_apply_async);
}
diff --git a/tp-account-widgets/tpaw-utils.h b/tp-account-widgets/tpaw-utils.h
index d38a7a7b..c648ae80 100644
--- a/tp-account-widgets/tpaw-utils.h
+++ b/tp-account-widgets/tpaw-utils.h
@@ -38,6 +38,51 @@ const gchar *tpaw_service_name_to_display_name (const gchar *proto_name);
void tpaw_make_color_whiter (GdkRGBA *color);
+/* Copied from wocky/wocky-utils.h */
+
+#define tpaw_implement_finish_void(source, tag) \
+ if (g_simple_async_result_propagate_error (\
+ G_SIMPLE_ASYNC_RESULT (result), error)) \
+ return FALSE; \
+ g_return_val_if_fail (g_simple_async_result_is_valid (result, \
+ G_OBJECT(source), tag), \
+ FALSE); \
+ return TRUE;
+
+#define tpaw_implement_finish_copy_pointer(source, tag, copy_func, \
+ out_param) \
+ GSimpleAsyncResult *_simple; \
+ _simple = (GSimpleAsyncResult *) result; \
+ if (g_simple_async_result_propagate_error (_simple, error)) \
+ return FALSE; \
+ g_return_val_if_fail (g_simple_async_result_is_valid (result, \
+ G_OBJECT (source), tag), \
+ FALSE); \
+ if (out_param != NULL) \
+ *out_param = copy_func ( \
+ g_simple_async_result_get_op_res_gpointer (_simple)); \
+ return TRUE;
+
+#define tpaw_implement_finish_return_copy_pointer(source, tag, copy_func) \
+ GSimpleAsyncResult *_simple; \
+ _simple = (GSimpleAsyncResult *) result; \
+ if (g_simple_async_result_propagate_error (_simple, error)) \
+ return NULL; \
+ g_return_val_if_fail (g_simple_async_result_is_valid (result, \
+ G_OBJECT (source), tag), \
+ NULL); \
+ return copy_func (g_simple_async_result_get_op_res_gpointer (_simple));
+
+#define tpaw_implement_finish_return_pointer(source, tag) \
+ GSimpleAsyncResult *_simple; \
+ _simple = (GSimpleAsyncResult *) result; \
+ if (g_simple_async_result_propagate_error (_simple, error)) \
+ return NULL; \
+ g_return_val_if_fail (g_simple_async_result_is_valid (result, \
+ G_OBJECT (source), tag), \
+ NULL); \
+ return g_simple_async_result_get_op_res_gpointer (_simple);
+
G_END_DECLS
#endif /* __TPAW_UTILS_H__ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 21:22:54 +0000