[telepathy-glib/master] tp_proxy_signal_connection_v0_new: rename @interface to @iface

[Simon McVittie]

Same rationale as previous commit. In this case we also have to rename
a local variable from @iface to @iface_proxy.
---
 telepathy-glib/proxy-signals.c  |   18 +++++++++---------
 telepathy-glib/proxy-subclass.h |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/telepathy-glib/proxy-signals.c b/telepathy-glib/proxy-signals.c
index c472f3d..b31d61b 100644
--- a/telepathy-glib/proxy-signals.c
+++ b/telepathy-glib/proxy-signals.c
@@ -318,7 +318,7 @@ collect_none (DBusGProxy *dgproxy, TpProxySignalConnection *sc)
 /**
  * tp_proxy_signal_connection_v0_new:
  * @self: a proxy
- * @interface: a quark whose string value is the D-Bus interface
+ * @iface: a quark whose string value is the D-Bus interface
  * @member: the name of the signal to which we're connecting
  * @expected_types: an array of expected GTypes for the arguments, terminated
  *  by %G_TYPE_INVALID
@@ -356,7 +356,7 @@ collect_none (DBusGProxy *dgproxy, TpProxySignalConnection *sc)
  */
 TpProxySignalConnection *
 tp_proxy_signal_connection_v0_new (TpProxy *self,
-                                   GQuark interface,
+                                   GQuark iface,
                                    const gchar *member,
                                    const GType *expected_types,
                                    GCallback collect_args,
@@ -368,10 +368,10 @@ tp_proxy_signal_connection_v0_new (TpProxy *self,
                                    GError **error)
 {
   TpProxySignalConnection *sc;
-  DBusGProxy *iface = tp_proxy_borrow_interface_by_id (self,
-      interface, error);
+  DBusGProxy *iface_proxy = tp_proxy_borrow_interface_by_id (self,
+      iface, error);
 
-  if (iface == NULL)
+  if (iface_proxy == NULL)
     {
       if (destroy != NULL)
         destroy (user_data);
@@ -392,12 +392,12 @@ tp_proxy_signal_connection_v0_new (TpProxy *self,
 
   MORE_DEBUG ("(proxy=%p, if=%s, sig=%s, collect=%p, invoke=%p, "
       "cb=%p, ud=%p, dn=%p, wo=%p) -> %p",
-      self, g_quark_to_string (interface), member, collect_args,
+      self, g_quark_to_string (iface), member, collect_args,
       invoke_callback, callback, user_data, destroy, weak_object, sc);
 
   sc->refcount = 1;
   sc->proxy = self;
-  sc->iface_proxy = g_object_ref (iface);
+  sc->iface_proxy = g_object_ref (iface_proxy);
   sc->member = g_strdup (member);
   sc->collect_args = collect_args;
   sc->invoke_callback = invoke_callback;
@@ -413,10 +413,10 @@ tp_proxy_signal_connection_v0_new (TpProxy *self,
   g_signal_connect (self, "invalidated",
       G_CALLBACK (tp_proxy_signal_connection_proxy_invalidated), sc);
 
-  g_signal_connect (iface, "destroy",
+  g_signal_connect (iface_proxy, "destroy",
       G_CALLBACK (_tp_proxy_signal_connection_dgproxy_destroy), sc);
 
-  dbus_g_proxy_connect_signal (iface, member, collect_args, sc,
+  dbus_g_proxy_connect_signal (iface_proxy, member, collect_args, sc,
       tp_proxy_signal_connection_dropped);
 
   return sc;
diff --git a/telepathy-glib/proxy-subclass.h b/telepathy-glib/proxy-subclass.h
index b0f4a38..9de1606 100644
--- a/telepathy-glib/proxy-subclass.h
+++ b/telepathy-glib/proxy-subclass.h
@@ -46,7 +46,7 @@ void tp_proxy_pending_call_v0_take_results (TpProxyPendingCall *pc,
 void tp_proxy_pending_call_v0_completed (gpointer p);
 
 TpProxySignalConnection *tp_proxy_signal_connection_v0_new (TpProxy *self,
-    GQuark interface, const gchar *member,
+    GQuark iface, const gchar *member,
     const GType *expected_types,
     GCallback collect_args, TpProxyInvokeFunc invoke_callback,
     GCallback callback, gpointer user_data, GDestroyNotify destroy,
-- 
1.5.6.5