diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-05 18:28:15 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-06 14:57:17 +0100 |
| commit | 9ed97d9432d3c5fb254e077b389d2e19f313a7ce (patch) | |
| tree | 789eec582e3c2e4849260d2d9a1cbb62b260df21 | |
| parent | 3c6949d35782641676c6b55ad5c87cf9e691e439 (diff) | |
Use TP_STRUCT_TYPE_ALIAS_PAIR instead of HAZE_TP_ALIAS_PAIR_TYPE
| -rw-r--r-- | src/connection-aliasing.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c index d065cc8..c020ceb 100644 --- a/src/connection-aliasing.c +++ b/src/connection-aliasing.c @@ -21,15 +21,13 @@ #include "connection-aliasing.h" #include <telepathy-glib/contacts-mixin.h> +#include <telepathy-glib/gtypes.h> #include <telepathy-glib/handle.h> #include <telepathy-glib/interfaces.h> #include "connection.h" #include "debug.h" -#define HAZE_TP_ALIAS_PAIR_TYPE (dbus_g_type_get_struct ("GValueArray", \ - G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID)) - static gboolean can_alias (HazeConnection *conn) { @@ -186,9 +184,9 @@ set_alias_success_cb (PurpleAccount *account, base_conn = ACCOUNT_GET_TP_BASE_CONNECTION (account); - g_value_init (&entry, HAZE_TP_ALIAS_PAIR_TYPE); + g_value_init (&entry, TP_STRUCT_TYPE_ALIAS_PAIR); g_value_take_boxed (&entry, - dbus_g_type_specialized_construct (HAZE_TP_ALIAS_PAIR_TYPE)); + dbus_g_type_specialized_construct (TP_STRUCT_TYPE_ALIAS_PAIR)); dbus_g_type_struct_set (&entry, 0, base_conn->self_handle, @@ -342,9 +340,9 @@ blist_node_aliased_cb (PurpleBlistNode *node, tp_base_connection_get_handles (base_conn, TP_HANDLE_TYPE_CONTACT); handle = tp_handle_ensure (contact_handles, buddy->name, NULL, NULL); - g_value_init (&entry, HAZE_TP_ALIAS_PAIR_TYPE); + g_value_init (&entry, TP_STRUCT_TYPE_ALIAS_PAIR); g_value_take_boxed (&entry, - dbus_g_type_specialized_construct (HAZE_TP_ALIAS_PAIR_TYPE)); + dbus_g_type_specialized_construct (TP_STRUCT_TYPE_ALIAS_PAIR)); dbus_g_type_struct_set (&entry, 0, handle, |