[Telepathy-commits] [telepathy-gabble/master] conn-aliasing: use telepathy-glib GTypes

[Simon McVittie]

20080722170640-53eee-93fe19d084c5f91e66cadee37a1630d18944a270.gz
---
 src/conn-aliasing.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 10b6315..5b0556b 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "conn-aliasing.h"
 
+#include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/svc-connection.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
@@ -35,9 +36,6 @@
 #include "util.h"
 #include "vcard-manager.h"
 
-#define GABBLE_TP_ALIAS_PAIR_TYPE (dbus_g_type_get_struct ("GValueArray", \
-      G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID))
-
 static void gabble_conn_aliasing_pep_nick_reply_handler (
     GabbleConnection *conn, LmMessage *msg, TpHandle handle);
 static GQuark gabble_conn_aliasing_pep_alias_quark (void);
@@ -698,9 +696,9 @@ gabble_conn_aliasing_nickname_updated (GObject *object,
       goto OUT;
     }
 
-  g_value_init (&entry, GABBLE_TP_ALIAS_PAIR_TYPE);
+  g_value_init (&entry, TP_STRUCT_TYPE_ALIAS_PAIR);
   g_value_take_boxed (&entry, dbus_g_type_specialized_construct
-      (GABBLE_TP_ALIAS_PAIR_TYPE));
+      (TP_STRUCT_TYPE_ALIAS_PAIR));
 
   dbus_g_type_struct_set (&entry,
       0, handle,
-- 
1.5.6.3