[Telepathy-commits] [telepathy-salut/master] connection: fix declaration/code mixing

[Guillaume Desmottes]

---
 src/salut-connection.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/salut-connection.c b/src/salut-connection.c
index 8281a55..9b47b87 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -1306,10 +1306,11 @@ salut_connection_get_avatar_tokens (TpSvcConnectionInterfaceAvatars *iface,
   SalutConnection *self = SALUT_CONNECTION (iface);
   SalutConnectionPrivate *priv = SALUT_CONNECTION_GET_PRIVATE (self);
   TpBaseConnection *base = TP_BASE_CONNECTION (self);
+  TpHandleRepoIface *handle_repo;
 
   TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (base, context);
 
-  TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base,
+  handle_repo = tp_base_connection_get_handles (base,
       TP_HANDLE_TYPE_CONTACT);
 
   if (!tp_handles_are_valid (handle_repo, contacts, FALSE, &err))
@@ -1361,10 +1362,11 @@ salut_connection_get_known_avatar_tokens (
   SalutConnection *self = SALUT_CONNECTION (iface);
   SalutConnectionPrivate *priv = SALUT_CONNECTION_GET_PRIVATE (self);
   TpBaseConnection *base = TP_BASE_CONNECTION (self);
+  TpHandleRepoIface *handle_repo;
 
   TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (base, context);
 
-  TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base,
+  handle_repo = tp_base_connection_get_handles (base,
       TP_HANDLE_TYPE_CONTACT);
 
   if (!tp_handles_are_valid (handle_repo, contacts, FALSE, &err))
@@ -1488,10 +1490,11 @@ salut_connection_request_avatars (
   SalutConnection *self = SALUT_CONNECTION (iface);
   SalutConnectionPrivate *priv = SALUT_CONNECTION_GET_PRIVATE (self);
   TpBaseConnection *base = TP_BASE_CONNECTION (self);
+  TpHandleRepoIface *handle_repo;
 
   TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (base, context);
 
-  TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base,
+  handle_repo = tp_base_connection_get_handles (base,
       TP_HANDLE_TYPE_CONTACT);
 
   if (!tp_handles_are_valid (handle_repo, contacts, FALSE, &err))
@@ -1572,10 +1575,11 @@ salut_connection_request_avatar (TpSvcConnectionInterfaceAvatars *iface,
   TpBaseConnection *base = TP_BASE_CONNECTION (self);
   SalutContact *contact;
   GError *err = NULL;
+  TpHandleRepoIface *handle_repo;
 
   TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (base, context);
 
-  TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base,
+  handle_repo = tp_base_connection_get_handles (base,
       TP_HANDLE_TYPE_CONTACT);
 
   if (!tp_handle_is_valid (handle_repo, handle, &err))
-- 
1.5.6.5