[Telepathy-commits] [telepathy-salut/master] Renamed SalutFtChannel to SalutFileChannel.
Jonny Lamb
jonny.lamb at collabora.co.uk
Fri Nov 21 03:45:59 PST 2008
20080716133259-8ed0e-03c15d1117bb7e08ffb098acd17f36ec3d18142a.gz
---
src/salut-file-channel.c | 154 +++++++++++++++++++++++-----------------------
src/salut-file-channel.h | 52 ++++++++--------
src/salut-ft-manager.c | 20 +++---
3 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/src/salut-file-channel.c b/src/salut-file-channel.c
index d6da025..9440f12 100644
--- a/src/salut-file-channel.c
+++ b/src/salut-file-channel.c
@@ -1,5 +1,5 @@
/*
- * salut-file-channel.c - Source for SalutFtChannel
+ * salut-file-channel.c - Source for SalutFileChannel
* Copyright (C) 2007 Marco Barisione <marco at barisione.org>
* Copyright (C) 2005, 2007 Collabora Ltd.
* @author: Sjoerd Simons <sjoerd at luon.net>
@@ -52,7 +52,7 @@ channel_iface_init (gpointer g_iface, gpointer iface_data);
static void
file_transfer_iface_init (gpointer g_iface, gpointer iface_data);
-G_DEFINE_TYPE_WITH_CODE (SalutFtChannel, salut_ft_channel, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (SalutFileChannel, salut_file_channel, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
G_IMPLEMENT_INTERFACE (SALUT_TYPE_SVC_CHANNEL_TYPE_FILE,
@@ -84,7 +84,7 @@ enum
};
/* private structure */
-struct _SalutFtChannelPrivate {
+struct _SalutFileChannelPrivate {
gboolean dispose_has_run;
gboolean closed;
gchar *object_path;
@@ -98,7 +98,7 @@ struct _SalutFtChannelPrivate {
};
static void
-salut_ft_channel_do_close (SalutFtChannel *self)
+salut_file_channel_do_close (SalutFileChannel *self)
{
if (self->priv->closed)
return;
@@ -109,10 +109,10 @@ salut_ft_channel_do_close (SalutFtChannel *self)
}
static void
-salut_ft_channel_init (SalutFtChannel *obj)
+salut_file_channel_init (SalutFileChannel *obj)
{
- obj->priv = G_TYPE_INSTANCE_GET_PRIVATE (obj, SALUT_TYPE_FT_CHANNEL,
- SalutFtChannelPrivate);
+ obj->priv = G_TYPE_INSTANCE_GET_PRIVATE (obj, SALUT_TYPE_FILE_CHANNEL,
+ SalutFileChannelPrivate);
/* allocate any data required by the object here */
obj->priv->object_path = NULL;
@@ -122,12 +122,12 @@ salut_ft_channel_init (SalutFtChannel *obj)
}
static void
-salut_ft_channel_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+salut_file_channel_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- SalutFtChannel *self = SALUT_FT_CHANNEL (object);
+ SalutFileChannel *self = SALUT_FILE_CHANNEL (object);
switch (property_id)
{
@@ -159,12 +159,12 @@ salut_ft_channel_get_property (GObject *object,
}
static void
-salut_ft_channel_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+salut_file_channel_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- SalutFtChannel *self = SALUT_FT_CHANNEL (object);
+ SalutFileChannel *self = SALUT_FILE_CHANNEL (object);
const gchar *tmp;
switch (property_id)
@@ -204,20 +204,20 @@ salut_ft_channel_set_property (GObject *object,
}
static GObject *
-salut_ft_channel_constructor (GType type, guint n_props,
- GObjectConstructParam *props)
+salut_file_channel_constructor (GType type, guint n_props,
+ GObjectConstructParam *props)
{
GObject *obj;
- SalutFtChannel *self;
+ SalutFileChannel *self;
DBusGConnection *bus;
TpBaseConnection *base_conn;
TpHandleRepoIface *contact_repo;
/* Parent constructor chain */
- obj = G_OBJECT_CLASS (salut_ft_channel_parent_class)->
+ obj = G_OBJECT_CLASS (salut_file_channel_parent_class)->
constructor (type, n_props, props);
- self = SALUT_FT_CHANNEL (obj);
+ self = SALUT_FILE_CHANNEL (obj);
/* Ref our handle */
base_conn = TP_BASE_CONNECTION (self->priv->connection);
@@ -229,7 +229,7 @@ salut_ft_channel_constructor (GType type, guint n_props,
/* Initialize file transfer mixin */
tp_file_transfer_mixin_init (obj,
- G_STRUCT_OFFSET (SalutFtChannel, file_transfer), contact_repo);
+ G_STRUCT_OFFSET (SalutFileChannel, file_transfer), contact_repo);
/* Initialize the hash table used to convert from the id name
* to the numerical id. */
@@ -244,25 +244,25 @@ salut_ft_channel_constructor (GType type, guint n_props,
}
static void
-salut_ft_channel_dispose (GObject *object);
+salut_file_channel_dispose (GObject *object);
static void
-salut_ft_channel_finalize (GObject *object);
+salut_file_channel_finalize (GObject *object);
static void
-salut_ft_channel_class_init (SalutFtChannelClass *salut_ft_channel_class)
+salut_file_channel_class_init (SalutFileChannelClass *salut_file_channel_class)
{
- GObjectClass *object_class = G_OBJECT_CLASS (salut_ft_channel_class);
+ GObjectClass *object_class = G_OBJECT_CLASS (salut_file_channel_class);
GParamSpec *param_spec;
- g_type_class_add_private (salut_ft_channel_class,
- sizeof (SalutFtChannelPrivate));
+ g_type_class_add_private (salut_file_channel_class,
+ sizeof (SalutFileChannelPrivate));
- object_class->dispose = salut_ft_channel_dispose;
- object_class->finalize = salut_ft_channel_finalize;
+ object_class->dispose = salut_file_channel_dispose;
+ object_class->finalize = salut_file_channel_finalize;
- object_class->constructor = salut_ft_channel_constructor;
- object_class->get_property = salut_ft_channel_get_property;
- object_class->set_property = salut_ft_channel_set_property;
+ object_class->constructor = salut_file_channel_constructor;
+ object_class->get_property = salut_file_channel_get_property;
+ object_class->set_property = salut_file_channel_set_property;
g_object_class_override_property (object_class, PROP_OBJECT_PATH,
"object-path");
@@ -298,7 +298,7 @@ salut_ft_channel_class_init (SalutFtChannelClass *salut_ft_channel_class)
param_spec = g_param_spec_object (
"xmpp-connection-manager",
"SalutXmppConnectionManager object",
- "Salut XMPP Connection manager used for this FT channel",
+ "Salut XMPP Connection manager used for this file channel",
SALUT_TYPE_XMPP_CONNECTION_MANAGER,
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE |
@@ -308,14 +308,14 @@ salut_ft_channel_class_init (SalutFtChannelClass *salut_ft_channel_class)
param_spec);
tp_file_transfer_mixin_class_init (object_class,
- G_STRUCT_OFFSET (SalutFtChannelClass,
+ G_STRUCT_OFFSET (SalutFileChannelClass,
file_transfer_class));
}
void
-salut_ft_channel_dispose (GObject *object)
+salut_file_channel_dispose (GObject *object)
{
- SalutFtChannel *self = SALUT_FT_CHANNEL (object);
+ SalutFileChannel *self = SALUT_FILE_CHANNEL (object);
TpBaseConnection *base_conn = TP_BASE_CONNECTION (self->priv->connection);
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base_conn,
TP_HANDLE_TYPE_CONTACT);
@@ -329,7 +329,7 @@ salut_ft_channel_dispose (GObject *object)
g_hash_table_unref (self->priv->name_to_id);
- salut_ft_channel_do_close (self);
+ salut_file_channel_do_close (self);
if (self->priv->contact)
{
@@ -351,76 +351,76 @@ salut_ft_channel_dispose (GObject *object)
/* release any references held by the object here */
- if (G_OBJECT_CLASS (salut_ft_channel_parent_class)->dispose)
- G_OBJECT_CLASS (salut_ft_channel_parent_class)->dispose (object);
+ if (G_OBJECT_CLASS (salut_file_channel_parent_class)->dispose)
+ G_OBJECT_CLASS (salut_file_channel_parent_class)->dispose (object);
}
static void
-salut_ft_channel_finalize (GObject *object)
+salut_file_channel_finalize (GObject *object)
{
- SalutFtChannel *self = SALUT_FT_CHANNEL (object);
+ SalutFileChannel *self = SALUT_FILE_CHANNEL (object);
/* free any data held directly by the object here */
g_free (self->priv->object_path);
tp_file_transfer_mixin_finalize (G_OBJECT (self));
- G_OBJECT_CLASS (salut_ft_channel_parent_class)->finalize (object);
+ G_OBJECT_CLASS (salut_file_channel_parent_class)->finalize (object);
}
/**
- * salut_ft_channel_close
+ * salut_file_channel_close
*
* Implements DBus method Close
* on interface org.freedesktop.Telepathy.Channel
*/
static void
-salut_ft_channel_close (TpSvcChannel *iface,
- DBusGMethodInvocation *context)
+salut_file_channel_close (TpSvcChannel *iface,
+ DBusGMethodInvocation *context)
{
- salut_ft_channel_do_close (SALUT_FT_CHANNEL (iface));
+ salut_file_channel_do_close (SALUT_FILE_CHANNEL (iface));
tp_svc_channel_return_from_close (context);
}
/**
- * salut_ft_channel_get_channel_type
+ * salut_file_channel_get_channel_type
*
* Implements DBus method GetChannelType
* on interface org.freedesktop.Telepathy.Channel
*/
static void
-salut_ft_channel_get_channel_type (TpSvcChannel *iface,
- DBusGMethodInvocation *context)
+salut_file_channel_get_channel_type (TpSvcChannel *iface,
+ DBusGMethodInvocation *context)
{
tp_svc_channel_return_from_get_channel_type (context,
SALUT_IFACE_CHANNEL_TYPE_FILE);
}
/**
- * salut_ft_channel_get_handle
+ * salut_file_channel_get_handle
*
* Implements DBus method GetHandle
* on interface org.freedesktop.Telepathy.Channel
*/
static void
-salut_ft_channel_get_handle (TpSvcChannel *iface,
- DBusGMethodInvocation *context)
+salut_file_channel_get_handle (TpSvcChannel *iface,
+ DBusGMethodInvocation *context)
{
- SalutFtChannel *self = SALUT_FT_CHANNEL (iface);
+ SalutFileChannel *self = SALUT_FILE_CHANNEL (iface);
tp_svc_channel_return_from_get_handle (context, TP_HANDLE_TYPE_CONTACT,
self->priv->handle);
}
/**
- * salut_ft_channel_get_interfaces
+ * salut_file_channel_get_interfaces
*
* Implements DBus method GetInterfaces
* on interface org.freedesktop.Telepathy.Channel
*/
static void
-salut_ft_channel_get_interfaces (TpSvcChannel *iface,
+salut_file_channel_get_interfaces (TpSvcChannel *iface,
DBusGMethodInvocation *context)
{
const char *interfaces[] = { NULL };
@@ -434,7 +434,7 @@ channel_iface_init (gpointer g_iface, gpointer iface_data)
TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface;
#define IMPLEMENT(x) tp_svc_channel_implement_##x (\
- klass, salut_ft_channel_##x)
+ klass, salut_file_channel_##x)
IMPLEMENT (close);
IMPLEMENT (get_channel_type);
IMPLEMENT (get_handle);
@@ -443,7 +443,7 @@ channel_iface_init (gpointer g_iface, gpointer iface_data)
}
static GibberFileTransfer *
-get_file_transfer (SalutFtChannel *self,
+get_file_transfer (SalutFileChannel *self,
guint id,
GError **error)
{
@@ -468,19 +468,19 @@ error_cb (GibberFileTransfer *ft,
guint domain,
gint code,
const gchar *message,
- SalutFtChannel *self)
+ SalutFileChannel *self)
{
}
static void
ft_finished_cb (GibberFileTransfer *ft,
- SalutFtChannel *self)
+ SalutFileChannel *self)
{
}
static void
remote_accepted_cb (GibberFileTransfer *ft,
- SalutFtChannel *self)
+ SalutFileChannel *self)
{
guint id;
@@ -492,10 +492,10 @@ remote_accepted_cb (GibberFileTransfer *ft,
}
static gboolean
-setup_local_socket (SalutFtChannel *self, guint id);
+setup_local_socket (SalutFileChannel *self, guint id);
static void
-send_file_offer (SalutFtChannel *self,
+send_file_offer (SalutFileChannel *self,
guint id)
{
GValue *val;
@@ -542,7 +542,7 @@ send_file_offer (SalutFtChannel *self,
/* passed as user_data to the callbacl for the "new-connection" signal
* emitted by the SalutXmppConnectionManager */
typedef struct {
- SalutFtChannel *self;
+ SalutFileChannel *self;
guint id;
} NewConnectionData;
@@ -571,9 +571,9 @@ value_free (GValue *value)
}
void
-salut_ft_channel_received_file_offer (SalutFtChannel *self,
- GibberXmppStanza *stanza,
- GibberXmppConnection *conn)
+salut_file_channel_received_file_offer (SalutFileChannel *self,
+ GibberXmppStanza *stanza,
+ GibberXmppConnection *conn)
{
GibberFileTransfer *ft;
GHashTable *information;
@@ -601,17 +601,17 @@ salut_ft_channel_received_file_offer (SalutFtChannel *self,
}
/**
- * salut_ft_channel_accept_file
+ * salut_file_channel_accept_file
*
* Implements D-Bus method AcceptFile
* on interface org.freedesktop.Telepathy.Channel.Type.File
*/
static void
-salut_ft_channel_accept_file (SalutSvcChannelTypeFile *iface,
- guint id,
- DBusGMethodInvocation *context)
+salut_file_channel_accept_file (SalutSvcChannelTypeFile *iface,
+ guint id,
+ DBusGMethodInvocation *context)
{
- SalutFtChannel *self = SALUT_FT_CHANNEL (iface);
+ SalutFileChannel *self = SALUT_FILE_CHANNEL (iface);
GibberFileTransfer *ft;
GError *error = NULL;
GValue *out_address = { 0 };
@@ -649,7 +649,7 @@ file_transfer_iface_init (gpointer g_iface,
tp_file_transfer_mixin_iface_init (g_iface, iface_data);
salut_svc_channel_type_file_implement_accept_file (klass,
- (salut_svc_channel_type_file_accept_file_impl) salut_ft_channel_accept_file);
+ (salut_svc_channel_type_file_accept_file_impl) salut_file_channel_accept_file);
}
@@ -658,7 +658,7 @@ file_transfer_iface_init (gpointer g_iface,
* GetLocalUnixSocketPath().
*/
static GIOChannel *
-get_socket_channel (SalutFtChannel *self,
+get_socket_channel (SalutFileChannel *self,
guint id)
{
gint fd;
@@ -710,7 +710,7 @@ get_socket_channel (SalutFtChannel *self,
}
typedef struct {
- SalutFtChannel *self;
+ SalutFileChannel *self;
guint id;
} LocalSocketWatchData;
@@ -766,7 +766,7 @@ accept_local_socket_connection (GIOChannel *source,
}
static gboolean
-setup_local_socket (SalutFtChannel *self, guint id)
+setup_local_socket (SalutFileChannel *self, guint id)
{
GIOChannel *io_channel;
LocalSocketWatchData *watch_data;
diff --git a/src/salut-file-channel.h b/src/salut-file-channel.h
index 1272264..bbbd2c0 100644
--- a/src/salut-file-channel.h
+++ b/src/salut-file-channel.h
@@ -1,5 +1,5 @@
/*
- * salut-file-channel.h - Header for SalutFtChannel
+ * salut-file-channel.h - Header for SalutFileChannel
* Copyright (C) 2007 Marco Barisione <marco at barisione.org>
* Copyright (C) 2005, 2007 Collabora Ltd.
*
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __SALUT_FT_CHANNEL_H__
-#define __SALUT_FT_CHANNEL_H__
+#ifndef __SALUT_FILE_CHANNEL_H__
+#define __SALUT_FILE_CHANNEL_H__
#include <glib-object.h>
#include <gibber/gibber-file-transfer.h>
@@ -30,46 +30,46 @@
G_BEGIN_DECLS
-typedef struct _SalutFtChannel SalutFtChannel;
-typedef struct _SalutFtChannelClass SalutFtChannelClass;
-typedef struct _SalutFtChannelPrivate SalutFtChannelPrivate;
+typedef struct _SalutFileChannel SalutFileChannel;
+typedef struct _SalutFileChannelClass SalutFileChannelClass;
+typedef struct _SalutFileChannelPrivate SalutFileChannelPrivate;
-struct _SalutFtChannelClass {
+struct _SalutFileChannelClass {
GObjectClass parent_class;
TpTextMixinClass text_class;
TpFileTransferMixinClass file_transfer_class;
};
-struct _SalutFtChannel {
+struct _SalutFileChannel {
GObject parent;
TpTextMixin text;
TpFileTransferMixin file_transfer;
- SalutFtChannelPrivate *priv;
+ SalutFileChannelPrivate *priv;
};
-GType salut_ft_channel_get_type (void);
+GType salut_file_channel_get_type (void);
/* TYPE MACROS */
-#define SALUT_TYPE_FT_CHANNEL \
- (salut_ft_channel_get_type ())
-#define SALUT_FT_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), SALUT_TYPE_FT_CHANNEL, SalutFtChannel))
-#define SALUT_FT_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), SALUT_TYPE_FT_CHANNEL, \
- SalutFtChannelClass))
-#define SALUT_IS_FT_CHANNEL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), SALUT_TYPE_FT_CHANNEL))
-#define SALUT_IS_FT_CHANNEL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), SALUT_TYPE_FT_CHANNEL))
-#define SALUT_FT_CHANNEL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), SALUT_TYPE_FT_CHANNEL, \
- SalutFtChannelClass))
+#define SALUT_TYPE_FILE_CHANNEL \
+ (salut_file_channel_get_type ())
+#define SALUT_FILE_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), SALUT_TYPE_FILE_CHANNEL, SalutFileChannel))
+#define SALUT_FILE_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), SALUT_TYPE_FILE_CHANNEL, \
+ SalutFileChannelClass))
+#define SALUT_IS_FILE_CHANNEL(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), SALUT_TYPE_FILE_CHANNEL))
+#define SALUT_IS_FILE_CHANNEL_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), SALUT_TYPE_FILE_CHANNEL))
+#define SALUT_FILE_CHANNEL_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), SALUT_TYPE_FILE_CHANNEL, \
+ SalutFileChannelClass))
void
-salut_ft_channel_received_file_offer (SalutFtChannel *self,
+salut_file_channel_received_file_offer (SalutFileChannel *self,
GibberXmppStanza *stanza, GibberXmppConnection *conn);
G_END_DECLS
-#endif /* #ifndef __SALUT_FT_CHANNEL_H__*/
+#endif /* #ifndef __SALUT_FILE_CHANNEL_H__*/
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index d44975d..f7ef334 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -40,7 +40,7 @@
static void
salut_ft_manager_factory_iface_init (gpointer *g_iface, gpointer *iface_data);
-static SalutFtChannel *
+static SalutFileChannel *
salut_ft_manager_new_channel (SalutFtManager *mgr, TpHandle handle);
G_DEFINE_TYPE_WITH_CODE (SalutFtManager, salut_ft_manager, G_TYPE_OBJECT,
@@ -105,7 +105,7 @@ message_stanza_callback (SalutXmppConnectionManager *mgr,
{
SalutFtManager *self = SALUT_FT_MANAGER (user_data);
SalutFtManagerPrivate *priv = SALUT_FT_MANAGER_GET_PRIVATE (self);
- SalutFtChannel *chan;
+ SalutFileChannel *chan;
TpHandle handle;
TpBaseConnection *base_conn = TP_BASE_CONNECTION (priv->connection);
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base_conn,
@@ -118,7 +118,7 @@ message_stanza_callback (SalutXmppConnectionManager *mgr,
if (chan == NULL)
chan = salut_ft_manager_new_channel (self, handle);
- salut_ft_channel_received_file_offer (chan, stanza, conn);
+ salut_file_channel_received_file_offer (chan, stanza, conn);
}
static void salut_ft_manager_dispose (GObject *object);
@@ -251,7 +251,7 @@ salut_ft_manager_factory_iface_foreach (TpChannelFactoryIface *iface,
}
static void
-ft_channel_closed_cb (SalutFtChannel *chan, gpointer user_data)
+file_channel_closed_cb (SalutFileChannel *chan, gpointer user_data)
{
SalutFtManager *self = SALUT_FT_MANAGER (user_data);
SalutFtManagerPrivate *priv = SALUT_FT_MANAGER_GET_PRIVATE (self);
@@ -265,7 +265,7 @@ ft_channel_closed_cb (SalutFtChannel *chan, gpointer user_data)
}
}
-static SalutFtChannel *
+static SalutFileChannel *
salut_ft_manager_new_channel (SalutFtManager *mgr,
TpHandle handle)
{
@@ -273,7 +273,7 @@ salut_ft_manager_new_channel (SalutFtManager *mgr,
TpBaseConnection *base_connection = TP_BASE_CONNECTION (priv->connection);
TpHandleRepoIface *handle_repo =
tp_base_connection_get_handles (base_connection, TP_HANDLE_TYPE_CONTACT);
- SalutFtChannel *chan;
+ SalutFileChannel *chan;
SalutContact *contact;
const gchar *name;
gchar *path = NULL;
@@ -289,9 +289,9 @@ salut_ft_manager_new_channel (SalutFtManager *mgr,
}
name = tp_handle_inspect (handle_repo, handle);
- path = g_strdup_printf ("%s/FtChannel/%u",
+ path = g_strdup_printf ("%s/FileChannel/%u",
base_connection->object_path, handle);
- chan = g_object_new (SALUT_TYPE_FT_CHANNEL,
+ chan = g_object_new (SALUT_TYPE_FILE_CHANNEL,
"connection", priv->connection,
"contact", contact,
"object-path", path,
@@ -303,7 +303,7 @@ salut_ft_manager_new_channel (SalutFtManager *mgr,
g_hash_table_insert (priv->channels, GINT_TO_POINTER (handle), chan);
tp_channel_factory_iface_emit_new_channel (mgr, TP_CHANNEL_IFACE (chan),
NULL);
- g_signal_connect (chan, "closed", G_CALLBACK (ft_channel_closed_cb), mgr);
+ g_signal_connect (chan, "closed", G_CALLBACK (file_channel_closed_cb), mgr);
return chan;
}
@@ -319,7 +319,7 @@ salut_ft_manager_factory_iface_request (TpChannelFactoryIface *iface,
{
SalutFtManager *mgr = SALUT_FT_MANAGER (iface);
SalutFtManagerPrivate *priv = SALUT_FT_MANAGER_GET_PRIVATE (mgr);
- SalutFtChannel *chan;
+ SalutFileChannel *chan;
gboolean created = FALSE;
TpBaseConnection *base_connection = TP_BASE_CONNECTION (priv->connection);
TpHandleRepoIface *handle_repo =
--
1.5.6.5
More information about the Telepathy-commits
mailing list