rename TpBasicChannelFactory to TpBasicProxyFactory

7 files changed, 86 insertions, 86 deletions

diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index 6c8185dbb..a0d7961dc 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -139,8 +139,8 @@ libtelepathy_glib_internal_la_SOURCES = \
     base-connection-manager.c \
     base-protocol-internal.h \
     base-protocol.c \
-    basic-channel-factory.c \
-    basic-channel-factory.h \
+    basic-proxy-factory.c \
+    basic-proxy-factory.h \
     capabilities.c \
     capabilities-internal.h \
     channel.c \
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 3c8bfff32..63b8b2a09 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -165,7 +165,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include <telepathy-glib/add-dispatch-operation-context-internal.h>
-#include <telepathy-glib/basic-channel-factory.h>
+#include <telepathy-glib/basic-proxy-factory.h>
 #include <telepathy-glib/channel-dispatch-operation-internal.h>
 #include <telepathy-glib/channel-request.h>
 #include <telepathy-glib/channel.h>
@@ -1082,7 +1082,7 @@ tp_base_client_constructed (GObject *object)
   if (self->priv->channel_factory == NULL)
     {
       self->priv->channel_factory = TP_CLIENT_CHANNEL_FACTORY (
-          tp_basic_channel_factory_new ());
+          tp_basic_proxy_factory_new ());
     }
   else
     {
@@ -1331,7 +1331,7 @@ tp_base_client_class_init (TpBaseClientClass *cls)
    * While the client has not been registerd, this property can be changed
    * using tp_base_client_set_channel_factory().
    *
-   * If no channel factory is specified then #TpBasicChannelFactory is used.
+   * If no channel factory is specified then #TpBasicProxyFactory is used.
    *
    * Since: 0.13.UNRELEASED
    */
diff --git a/telepathy-glib/basic-channel-factory.h b/telepathy-glib/basic-channel-factory.h
deleted file mode 100644
index 90de719de..000000000
--- a/telepathy-glib/basic-channel-factory.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Simple client channel factory creating TpChannel
- *
- * Copyright © 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __TP_BASIC_CHANNEL_FACTORY_H__
-#define __TP_BASIC_CHANNEL_FACTORY_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _TpBasicChannelFactory TpBasicChannelFactory;
-typedef struct _TpBasicChannelFactoryClass TpBasicChannelFactoryClass;
-
-struct _TpBasicChannelFactoryClass {
-    /*<public>*/
-    GObjectClass parent_class;
-};
-
-struct _TpBasicChannelFactory {
-    /*<private>*/
-    GObject parent;
-};
-
-GType tp_basic_channel_factory_get_type (void);
-
-#define TP_TYPE_BASIC_CHANNEL_FACTORY \
-  (tp_basic_channel_factory_get_type ())
-#define TP_BASIC_CHANNEL_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASIC_CHANNEL_FACTORY, \
-                               TpBasicChannelFactory))
-#define TP_BASIC_CHANNEL_FACTORY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASIC_CHANNEL_FACTORY, \
-                            TpBasicChannelFactoryClass))
-#define TP_IS_BASIC_CHANNEL_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASIC_CHANNEL_FACTORY))
-#define TP_IS_BASIC_CHANNEL_FACTORY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_BASIC_CHANNEL_FACTORY))
-#define TP_BASIC_CHANNEL_FACTORY_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASIC_CHANNEL_FACTORY, \
-                              TpBasicChannelFactoryClass))
-
-TpBasicChannelFactory * tp_basic_channel_factory_new (void);
-
-G_END_DECLS
-
-#endif
diff --git a/telepathy-glib/basic-channel-factory.c b/telepathy-glib/basic-proxy-factory.c
index 923e1bdd3..63f680147 100644
--- a/telepathy-glib/basic-channel-factory.c
+++ b/telepathy-glib/basic-proxy-factory.c
@@ -19,8 +19,8 @@
  */
 
 /**
- * SECTION:basic-channel-factory
- * @title: TpBasicChannelFactory
+ * SECTION:basic-proxy-factory
+ * @title: TpBasicProxyFactory
  * @short_description: channel factory creating TpChannel objects
  *
  * This factory implements the #TpClientChannelFactory interface to create
@@ -29,23 +29,23 @@
  */
 
 /**
- * TpBasicChannelFactory:
+ * TpBasicProxyFactory:
  *
- * Data structure representing a #TpBasicChannelFactory
+ * Data structure representing a #TpBasicProxyFactory
  *
  * Since: 0.13.UNRELEASED
  */
 
 /**
- * TpBasicChannelFactoryClass:
+ * TpBasicProxyFactoryClass:
  * @parent_class: the parent class
  *
- * The class of a #TpBasicChannelFactory.
+ * The class of a #TpBasicProxyFactory.
  *
  * Since: 0.13.UNRELEASED
  */
 
-#include "telepathy-glib/basic-channel-factory.h"
+#include "telepathy-glib/basic-proxy-factory.h"
 
 #include <telepathy-glib/client-channel-factory.h>
 
@@ -54,17 +54,17 @@
 
 static void client_channel_factory_iface_init (gpointer, gpointer);
 
-G_DEFINE_TYPE_WITH_CODE(TpBasicChannelFactory, tp_basic_channel_factory, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE(TpBasicProxyFactory, tp_basic_proxy_factory, G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_CLIENT_CHANNEL_FACTORY,
       client_channel_factory_iface_init))
 
 static void
-tp_basic_channel_factory_init (TpBasicChannelFactory *self)
+tp_basic_proxy_factory_init (TpBasicProxyFactory *self)
 {
 }
 
 static void
-tp_basic_channel_factory_class_init (TpBasicChannelFactoryClass *cls)
+tp_basic_proxy_factory_class_init (TpBasicProxyFactoryClass *cls)
 {
 }
 
@@ -79,17 +79,17 @@ client_channel_factory_iface_init (gpointer g_iface,
 }
 
 /**
- * tp_basic_channel_factory_new:
+ * tp_basic_proxy_factory_new:
  *
- * Convenient function to create a new #TpBasicChannelFactory instance.
+ * Convenient function to create a new #TpBasicProxyFactory instance.
  *
- * Returns: a new #TpBasicChannelFactory
+ * Returns: a new #TpBasicProxyFactory
  *
  * Since: 0.13.UNRELEASED
  */
-TpBasicChannelFactory *
-tp_basic_channel_factory_new (void)
+TpBasicProxyFactory *
+tp_basic_proxy_factory_new (void)
 {
-  return g_object_new (TP_TYPE_BASIC_CHANNEL_FACTORY,
+  return g_object_new (TP_TYPE_BASIC_PROXY_FACTORY,
       NULL);
 }
diff --git a/telepathy-glib/basic-proxy-factory.h b/telepathy-glib/basic-proxy-factory.h
new file mode 100644
index 000000000..0701dba12
--- /dev/null
+++ b/telepathy-glib/basic-proxy-factory.h
@@ -0,0 +1,63 @@
+/*
+ * Basic proxy factory
+ *
+ * Copyright © 2010 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __TP_BASIC_PROXY_FACTORY_H__
+#define __TP_BASIC_PROXY_FACTORY_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct _TpBasicProxyFactory TpBasicProxyFactory;
+typedef struct _TpBasicProxyFactoryClass TpBasicProxyFactoryClass;
+
+struct _TpBasicProxyFactoryClass {
+    /*<public>*/
+    GObjectClass parent_class;
+};
+
+struct _TpBasicProxyFactory {
+    /*<private>*/
+    GObject parent;
+};
+
+GType tp_basic_proxy_factory_get_type (void);
+
+#define TP_TYPE_BASIC_PROXY_FACTORY \
+  (tp_basic_proxy_factory_get_type ())
+#define TP_BASIC_PROXY_FACTORY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASIC_PROXY_FACTORY, \
+                               TpBasicProxyFactory))
+#define TP_BASIC_PROXY_FACTORY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASIC_PROXY_FACTORY, \
+                            TpBasicProxyFactoryClass))
+#define TP_IS_BASIC_PROXY_FACTORY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASIC_PROXY_FACTORY))
+#define TP_IS_BASIC_PROXY_FACTORY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_BASIC_PROXY_FACTORY))
+#define TP_BASIC_PROXY_FACTORY_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASIC_PROXY_FACTORY, \
+                              TpBasicProxyFactoryClass))
+
+TpBasicProxyFactory * tp_basic_proxy_factory_new (void);
+
+G_END_DECLS
+
+#endif
diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index 5030f66c1..c24706c6a 100644
--- a/telepathy-glib/introspection.am
+++ b/telepathy-glib/introspection.am
@@ -10,7 +10,7 @@ INTROSPECTION_FILES = \
 	$(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \
 	$(srcdir)/account-manager.c $(srcdir)/account-manager.h \
 	$(srcdir)/automatic-channel-factory.c $(srcdir)/automatic-channel-factory.h \
-	$(srcdir)/basic-channel-factory.c $(srcdir)/basic-channel-factory.h \
+	$(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \
 	$(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \
 	$(srcdir)/connection.c $(srcdir)/connection.h \
 	$(srcdir)/connection-handles.c $(srcdir)/connection-contact-info.c \
diff --git a/telepathy-glib/telepathy-glib.h b/telepathy-glib/telepathy-glib.h
index 720faca0e..b5ae61f8b 100644
--- a/telepathy-glib/telepathy-glib.h
+++ b/telepathy-glib/telepathy-glib.h
@@ -54,7 +54,7 @@
 #include <telepathy-glib/stream-tube-connection.h>
 #include <telepathy-glib/client-channel-factory.h>
 #include <telepathy-glib/automatic-channel-factory.h>
-#include <telepathy-glib/basic-channel-factory.h>
+#include <telepathy-glib/basic-proxy-factory.h>
 
 #include <telepathy-glib/svc-generic.h>
 #include <telepathy-glib/svc-client.h>