[Telepathy-commits] [telepathy-salut/master] Rename SalutBytestreamManager to SalutSiBytestreamManager
Alban Crequy
alban.crequy at collabora.co.uk
Tue Nov 25 03:59:16 PST 2008
20080724115347-a41c0-1505e20ff53bf34c1514c76f44ec20a01b743aee.gz
---
src/debug.c | 4 +-
src/debug.h | 2 +-
src/salut-connection.c | 35 +++++---
src/salut-si-bytestream-manager.c | 171 +++++++++++++++++++------------------
src/salut-si-bytestream-manager.h | 62 +++++++-------
src/tube-stream.c | 6 +-
6 files changed, 148 insertions(+), 132 deletions(-)
diff --git a/src/debug.c b/src/debug.c
index a2ab089..e2df550 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -66,7 +66,9 @@ GDebugKey keys[] = {
{ "self", DEBUG_SELF },
{ "tubes", DEBUG_TUBES },
{ "xmpp-connection-manager", DEBUG_XCM },
- { "bytestream-manager", DEBUG_BYTESTREAM_MGR },
+ { "si-bytestream-manager", DEBUG_SI_BYTESTREAM_MGR },
+ { "discovery", DEBUG_DISCO },
+ { "olpc-activity", DEBUG_OLPC_ACTIVITY },
{ "all", ~0 },
{ 0, },
};
diff --git a/src/debug.h b/src/debug.h
index 9229d77..3843644 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -27,7 +27,7 @@ typedef enum
DEBUG_MUC_CONNECTION = 1 << 8,
DEBUG_CONNECTION = 1 << 9,
DEBUG_IM = 1 << 10,
- DEBUG_BYTESTREAM_MGR = 1 << 11,
+ DEBUG_SI_BYTESTREAM_MGR = 1 << 11,
DEBUG_NET = 1 << 12,
DEBUG_SELF = 1 << 13,
DEBUG_TUBES = 1 << 14,
diff --git a/src/salut-connection.c b/src/salut-connection.c
index bc043b4..369aec8 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -135,7 +135,11 @@ enum {
PROP_CONTACT_MANAGER,
PROP_SELF,
PROP_XCM,
- PROP_BYTESTREAM_MANAGER,
+ PROP_SI_BYTESTREAM_MANAGER,
+#ifdef ENABLE_OLPC
+ PROP_OLPC_ACTIVITY_MANAGER,
+#endif
+ PROP_BACKEND,
LAST_PROP
};
@@ -179,7 +183,14 @@ struct _SalutConnectionPrivate
SalutTubesManager *tubes_manager;
/* Bytestream manager */
- SalutBytestreamManager *bytestream_manager;
+ SalutSiBytestreamManager *si_bytestream_manager;
+
+#ifdef ENABLE_OLPC
+ SalutOlpcActivityManager *olpc_activity_manager;
+#endif
+
+ /* Backend type: avahi or dummy */
+ GType backend_type;
};
#define SALUT_CONNECTION_GET_PRIVATE(o) \
@@ -293,8 +304,8 @@ salut_connection_get_property (GObject *object,
case PROP_XCM:
g_value_set_object (value, priv->xmpp_connection_manager);
break;
- case PROP_BYTESTREAM_MANAGER:
- g_value_set_object (value, priv->bytestream_manager);
+ case PROP_SI_BYTESTREAM_MANAGER:
+ g_value_set_object (value, priv->si_bytestream_manager);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -658,13 +669,13 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
param_spec = g_param_spec_object (
"bytestream-manager",
- "SalutBytestreamManager object",
+ "SalutSiBytestreamManager object",
"The Salut Bytestream Manager associated with this Salut Connection",
- SALUT_TYPE_BYTESTREAM_MANAGER,
+ SALUT_TYPE_SI_BYTESTREAM_MANAGER,
G_PARAM_READABLE |
G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB);
- g_object_class_install_property (object_class, PROP_BYTESTREAM_MANAGER,
+ g_object_class_install_property (object_class, PROP_SI_BYTESTREAM_MANAGER,
param_spec);
}
@@ -701,10 +712,10 @@ salut_connection_dispose (GObject *object)
priv->avahi_client = NULL;
}
- if (priv->bytestream_manager != NULL)
+ if (priv->si_bytestream_manager != NULL)
{
- g_object_unref (priv->bytestream_manager);
- priv->bytestream_manager = NULL;
+ g_object_unref (priv->si_bytestream_manager);
+ priv->si_bytestream_manager = NULL;
}
/* release any references held by the object here */
@@ -859,8 +870,8 @@ _ga_client_running_cb(GaClient *c,
}
/* Create the bytestream manager */
- priv->bytestream_manager = salut_bytestream_manager_new (self,
- avahi_client_get_host_name_fqdn (priv->avahi_client->avahi_client));
+ priv->si_bytestream_manager = salut_si_bytestream_manager_new (self,
+ salut_discovery_client_get_host_name_fqdn (priv->discovery_client));
}
/* public functions */
diff --git a/src/salut-si-bytestream-manager.c b/src/salut-si-bytestream-manager.c
index 30398a2..60bfdfe 100644
--- a/src/salut-si-bytestream-manager.c
+++ b/src/salut-si-bytestream-manager.c
@@ -1,5 +1,5 @@
/*
- * salut-bytestream-manager.c - Source for SalutBytestreamManager
+ * salut-si-bytestream-manager.c - Source for SalutSiBytestreamManager
* Copyright (C) 2007 Collabora Ltd.
*
* This library is free software; you can redistribute it and/or
@@ -34,10 +34,11 @@
#include "salut-muc-manager.h"
#include "salut-tubes-manager.h"
-#define DEBUG_FLAG DEBUG_BYTESTREAM_MGR
+#define DEBUG_FLAG DEBUG_SI_BYTESTREAM_MGR
#include "debug.h"
-G_DEFINE_TYPE (SalutBytestreamManager, salut_bytestream_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (SalutSiBytestreamManager, salut_si_bytestream_manager,
+ G_TYPE_OBJECT)
/* properties */
enum
@@ -48,9 +49,9 @@ enum
};
/* private structure */
-typedef struct _SalutBytestreamManagerPrivate SalutBytestreamManagerPrivate;
+typedef struct _SalutSiBytestreamManagerPrivate SalutSiBytestreamManagerPrivate;
-struct _SalutBytestreamManagerPrivate
+struct _SalutSiBytestreamManagerPrivate
{
SalutConnection *connection;
SalutImManager *im_manager;
@@ -61,14 +62,14 @@ struct _SalutBytestreamManagerPrivate
gboolean dispose_has_run;
};
-#define SALUT_BYTESTREAM_MANAGER_GET_PRIVATE(obj) \
- ((SalutBytestreamManagerPrivate *) obj->priv)
+#define SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE(obj) \
+ ((SalutSiBytestreamManagerPrivate *) ((SalutSiBytestreamManager *)obj)->priv)
static void
-salut_bytestream_manager_init (SalutBytestreamManager *self)
+salut_si_bytestream_manager_init (SalutSiBytestreamManager *self)
{
- SalutBytestreamManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- SALUT_TYPE_BYTESTREAM_MANAGER, SalutBytestreamManagerPrivate);
+ SalutSiBytestreamManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ SALUT_TYPE_SI_BYTESTREAM_MANAGER, SalutSiBytestreamManagerPrivate);
self->priv = priv;
@@ -236,15 +237,15 @@ bytestream_state_changed (GibberBytestreamIface *bytestream,
}
GibberBytestreamIface *
-choose_bytestream_method (SalutBytestreamManager *self,
+choose_bytestream_method (SalutSiBytestreamManager *self,
GSList *stream_methods,
GibberXmppConnection *connection,
SalutContact *contact,
const gchar *stream_id,
const gchar *stream_init_id)
{
- SalutBytestreamManagerPrivate *priv =
- SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (self);
+ SalutSiBytestreamManagerPrivate *priv =
+ SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (self);
GSList *l;
/* We create the stream according the stream method chosen.
@@ -294,9 +295,9 @@ si_request_cb (SalutXmppConnectionManager *xcm,
SalutContact *contact,
gpointer user_data)
{
- SalutBytestreamManager *self = SALUT_BYTESTREAM_MANAGER (user_data);
- SalutBytestreamManagerPrivate *priv =
- SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (self);
+ SalutSiBytestreamManager *self = SALUT_SI_BYTESTREAM_MANAGER (user_data);
+ SalutSiBytestreamManagerPrivate *priv =
+ SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (self);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
(TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_CONTACT);
TpHandleRepoIface *room_repo = tp_base_connection_get_handles (
@@ -441,11 +442,11 @@ out:
}
void
-salut_bytestream_manager_dispose (GObject *object)
+salut_si_bytestream_manager_dispose (GObject *object)
{
- SalutBytestreamManager *self = SALUT_BYTESTREAM_MANAGER (object);
- SalutBytestreamManagerPrivate *priv = SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (
- self);
+ SalutSiBytestreamManager *self = SALUT_SI_BYTESTREAM_MANAGER (object);
+ SalutSiBytestreamManagerPrivate *priv = SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE
+ (self);
if (priv->dispose_has_run)
return;
@@ -456,31 +457,32 @@ salut_bytestream_manager_dispose (GObject *object)
g_object_unref (priv->muc_manager);
g_object_unref (priv->xmpp_connection_manager);
- if (G_OBJECT_CLASS (salut_bytestream_manager_parent_class)->dispose)
- G_OBJECT_CLASS (salut_bytestream_manager_parent_class)->dispose (object);
+ if (G_OBJECT_CLASS (salut_si_bytestream_manager_parent_class)->dispose)
+ G_OBJECT_CLASS (salut_si_bytestream_manager_parent_class)->dispose (object);
}
void
-salut_bytestream_manager_finalize (GObject *object)
+salut_si_bytestream_manager_finalize (GObject *object)
{
- SalutBytestreamManager *self = SALUT_BYTESTREAM_MANAGER (object);
- SalutBytestreamManagerPrivate *priv = SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (
+ SalutSiBytestreamManager *self = SALUT_SI_BYTESTREAM_MANAGER (object);
+ SalutSiBytestreamManagerPrivate *priv = SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (
self);
g_free (priv->host_name_fqdn);
- if (G_OBJECT_CLASS (salut_bytestream_manager_parent_class)->finalize)
- G_OBJECT_CLASS (salut_bytestream_manager_parent_class)->finalize (object);
+ if (G_OBJECT_CLASS (salut_si_bytestream_manager_parent_class)->finalize)
+ G_OBJECT_CLASS (salut_si_bytestream_manager_parent_class)->finalize
+ (object);
}
static void
-salut_bytestream_manager_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+salut_si_bytestream_manager_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- SalutBytestreamManager *self = SALUT_BYTESTREAM_MANAGER (object);
- SalutBytestreamManagerPrivate *priv = SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (
+ SalutSiBytestreamManager *self = SALUT_SI_BYTESTREAM_MANAGER (object);
+ SalutSiBytestreamManagerPrivate *priv = SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (
self);
switch (property_id)
@@ -498,13 +500,13 @@ salut_bytestream_manager_get_property (GObject *object,
}
static void
-salut_bytestream_manager_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+salut_si_bytestream_manager_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- SalutBytestreamManager *self = SALUT_BYTESTREAM_MANAGER (object);
- SalutBytestreamManagerPrivate *priv = SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (
+ SalutSiBytestreamManager *self = SALUT_SI_BYTESTREAM_MANAGER (object);
+ SalutSiBytestreamManagerPrivate *priv = SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (
self);
switch (property_id)
@@ -523,19 +525,19 @@ salut_bytestream_manager_set_property (GObject *object,
}
static GObject *
-salut_bytestream_manager_constructor (GType type,
+salut_si_bytestream_manager_constructor (GType type,
guint n_props,
GObjectConstructParam *props)
{
GObject *obj;
- SalutBytestreamManager *self;
- SalutBytestreamManagerPrivate *priv;
+ SalutSiBytestreamManager *self;
+ SalutSiBytestreamManagerPrivate *priv;
- obj = G_OBJECT_CLASS (salut_bytestream_manager_parent_class)->
+ obj = G_OBJECT_CLASS (salut_si_bytestream_manager_parent_class)->
constructor (type, n_props, props);
- self = SALUT_BYTESTREAM_MANAGER (obj);
- priv = SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (self);
+ self = SALUT_SI_BYTESTREAM_MANAGER (obj);
+ priv = SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (self);
g_assert (priv->connection != NULL);
g_object_get (priv->connection,
@@ -556,21 +558,22 @@ salut_bytestream_manager_constructor (GType type,
}
static void
-salut_bytestream_manager_class_init (
- SalutBytestreamManagerClass *salut_bytestream_manager_class)
+salut_si_bytestream_manager_class_init (
+ SalutSiBytestreamManagerClass *salut_si_bytestream_manager_class)
{
- GObjectClass *object_class = G_OBJECT_CLASS (salut_bytestream_manager_class);
+ GObjectClass *object_class = G_OBJECT_CLASS
+ (salut_si_bytestream_manager_class);
GParamSpec *param_spec;
- g_type_class_add_private (salut_bytestream_manager_class,
- sizeof (SalutBytestreamManagerPrivate));
+ g_type_class_add_private (salut_si_bytestream_manager_class,
+ sizeof (SalutSiBytestreamManagerPrivate));
- object_class->constructor = salut_bytestream_manager_constructor;
- object_class->dispose = salut_bytestream_manager_dispose;
- object_class->finalize = salut_bytestream_manager_finalize;
+ object_class->constructor = salut_si_bytestream_manager_constructor;
+ object_class->dispose = salut_si_bytestream_manager_dispose;
+ object_class->finalize = salut_si_bytestream_manager_finalize;
- object_class->get_property = salut_bytestream_manager_get_property;
- object_class->set_property = salut_bytestream_manager_set_property;
+ object_class->get_property = salut_si_bytestream_manager_get_property;
+ object_class->set_property = salut_si_bytestream_manager_set_property;
param_spec = g_param_spec_object (
"connection",
@@ -598,21 +601,21 @@ salut_bytestream_manager_class_init (
param_spec);
}
-SalutBytestreamManager *
-salut_bytestream_manager_new (SalutConnection *conn,
+SalutSiBytestreamManager *
+salut_si_bytestream_manager_new (SalutConnection *conn,
const gchar *host_name_fqdn)
{
g_return_val_if_fail (SALUT_IS_CONNECTION (conn), NULL);
return g_object_new (
- SALUT_TYPE_BYTESTREAM_MANAGER,
+ SALUT_TYPE_SI_BYTESTREAM_MANAGER,
"connection", conn,
"host-name-fqdn", host_name_fqdn,
NULL);
}
/**
- * salut_bytestream_manager_make_stream_init_iq
+ * salut_si_bytestream_manager_make_stream_init_iq
*
* @from: your contact
* @to: the contact to who you want to offer the stream
@@ -623,10 +626,10 @@ salut_bytestream_manager_new (SalutConnection *conn,
*
*/
GibberXmppStanza *
-salut_bytestream_manager_make_stream_init_iq (const gchar *from,
- const gchar *to,
- const gchar *stream_id,
- const gchar *profile)
+salut_si_bytestream_manager_make_stream_init_iq (const gchar *from,
+ const gchar *to,
+ const gchar *stream_id,
+ const gchar *profile)
{
return gibber_xmpp_stanza_build (
GIBBER_STANZA_TYPE_IQ, GIBBER_STANZA_SUB_TYPE_SET,
@@ -665,9 +668,9 @@ salut_bytestream_manager_make_stream_init_iq (const gchar *from,
struct streaminit_reply_cb_data
{
- SalutBytestreamManager *self;
+ SalutSiBytestreamManager *self;
gchar *stream_id;
- SalutBytestreamManagerNegotiateReplyFunc func;
+ SalutSiBytestreamManagerNegotiateReplyFunc func;
gpointer user_data;
gchar *iq_id;
SalutContact *contact;
@@ -726,8 +729,8 @@ check_bytestream_oob_peer_addr (GibberBytestreamOOB *bytestream,
socklen_t addrlen,
gpointer user_data)
{
- SalutBytestreamManager *self = SALUT_BYTESTREAM_MANAGER (user_data);
- SalutBytestreamManagerPrivate *priv = SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (
+ SalutSiBytestreamManager *self = SALUT_SI_BYTESTREAM_MANAGER (user_data);
+ SalutSiBytestreamManagerPrivate *priv = SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (
self);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
(TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_CONTACT);
@@ -767,8 +770,8 @@ si_request_reply_cb (SalutXmppConnectionManager *manager,
{
struct streaminit_reply_cb_data *data =
(struct streaminit_reply_cb_data *) user_data;
- SalutBytestreamManagerPrivate *priv =
- SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (data->self);
+ SalutSiBytestreamManagerPrivate *priv =
+ SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (data->self);
GibberStanzaSubType sub_type;
GibberXmppNode *si, *feature, *x;
GibberBytestreamIface *bytestream = NULL;
@@ -913,13 +916,13 @@ END:
}
static gboolean
-send_si_request (SalutBytestreamManager *self,
+send_si_request (SalutSiBytestreamManager *self,
GibberXmppConnection *connection,
struct streaminit_reply_cb_data *data,
GError **error)
{
- SalutBytestreamManagerPrivate *priv =
- SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (self);
+ SalutSiBytestreamManagerPrivate *priv =
+ SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (self);
const gchar *iq_id;
iq_id = gibber_xmpp_node_get_attribute (data->stanza->node, "id");
@@ -1004,11 +1007,11 @@ xmpp_connection_manager_connection_failed_cb (SalutXmppConnectionManager *mgr,
}
/*
- * salut_bytestream_manager_negotiate_stream:
+ * salut_si_bytestream_manager_negotiate_stream:
*
* @contact: the contact to who send the SI request
* @stanza: the SI negotiation IQ (created using
- * salut_bytestream_manager_make_stream_init_iq)
+ * salut_si_bytestream_manager_make_stream_init_iq)
* @stream_id: the stream identifier
* @func: the callback to call when we receive the answser of the request
* @user_data: user data to pass to the callback
@@ -1017,24 +1020,24 @@ xmpp_connection_manager_connection_failed_cb (SalutXmppConnectionManager *mgr,
* Send a Stream Initiation (XEP-0095) request.
*/
gboolean
-salut_bytestream_manager_negotiate_stream (SalutBytestreamManager *self,
- SalutContact *contact,
- GibberXmppStanza *stanza,
- const gchar *stream_id,
- SalutBytestreamManagerNegotiateReplyFunc func,
- gpointer user_data,
- GError **error)
+salut_si_bytestream_manager_negotiate_stream (SalutSiBytestreamManager *self,
+ SalutContact *contact,
+ GibberXmppStanza *stanza,
+ const gchar *stream_id,
+ SalutSiBytestreamManagerNegotiateReplyFunc func,
+ gpointer user_data,
+ GError **error)
{
- SalutBytestreamManagerPrivate *priv;
+ SalutSiBytestreamManagerPrivate *priv;
struct streaminit_reply_cb_data *data;
GibberXmppConnection *connection = NULL;
SalutXmppConnectionManagerRequestConnectionResult request_result;
- g_assert (SALUT_IS_BYTESTREAM_MANAGER (self));
+ g_assert (SALUT_IS_SI_BYTESTREAM_MANAGER (self));
g_assert (stream_id != NULL);
g_assert (func != NULL);
- priv = SALUT_BYTESTREAM_MANAGER_GET_PRIVATE (self);
+ priv = SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (self);
data = streaminit_reply_cb_data_new ();
data->self = self;
diff --git a/src/salut-si-bytestream-manager.h b/src/salut-si-bytestream-manager.h
index 8dceae2..d6fd620 100644
--- a/src/salut-si-bytestream-manager.h
+++ b/src/salut-si-bytestream-manager.h
@@ -1,5 +1,5 @@
/*
- * salut-bytestream-manager.h - Header for SalutBytestreamManager
+ * salut-si-bytestream-manager.h - Header for SalutSiBytestreamManager
* Copyright (C) 2007 Collabora Ltd.
*
* This library is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __SALUT_BYTESTREAM_MANAGER_H__
-#define __SALUT_BYTESTREAM_MANAGER_H__
+#ifndef __SALUT_SI_BYTESTREAM_MANAGER_H__
+#define __SALUT_SI_BYTESTREAM_MANAGER_H__
#include <glib-object.h>
#include "salut-xmpp-connection-manager.h"
@@ -29,55 +29,55 @@
G_BEGIN_DECLS
-typedef struct _SalutBytestreamManager SalutBytestreamManager;
-typedef struct _SalutBytestreamManagerClass SalutBytestreamManagerClass;
+typedef struct _SalutSiBytestreamManager SalutSiBytestreamManager;
+typedef struct _SalutSiBytestreamManagerClass SalutSiBytestreamManagerClass;
-struct _SalutBytestreamManagerClass {
+struct _SalutSiBytestreamManagerClass {
GObjectClass parent_class;
};
-struct _SalutBytestreamManager {
+struct _SalutSiBytestreamManager {
GObject parent;
gpointer priv;
};
-GType salut_bytestream_manager_get_type(void);
+GType salut_si_bytestream_manager_get_type (void);
/* TYPE MACROS */
-#define SALUT_TYPE_BYTESTREAM_MANAGER \
- (salut_bytestream_manager_get_type())
-#define SALUT_BYTESTREAM_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), SALUT_TYPE_BYTESTREAM_MANAGER, \
- SalutBytestreamManager))
-#define SALUT_BYTESTREAM_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), SALUT_TYPE_BYTESTREAM_MANAGER, \
- SalutBytestreamManagerClass))
-#define SALUT_IS_BYTESTREAM_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), SALUT_TYPE_BYTESTREAM_MANAGER))
-#define SALUT_IS_BYTESTREAM_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), SALUT_TYPE_BYTESTREAM_MANAGER))
-#define SALUT_BYTESTREAM_MANAGER_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), SALUT_TYPE_BYTESTREAM_MANAGER, \
- SalutBytestreamManagerClass))
-
-typedef void (* SalutBytestreamManagerNegotiateReplyFunc) (
+#define SALUT_TYPE_SI_BYTESTREAM_MANAGER \
+ (salut_si_bytestream_manager_get_type ())
+#define SALUT_SI_BYTESTREAM_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), SALUT_TYPE_SI_BYTESTREAM_MANAGER, \
+ SalutSiBytestreamManager))
+#define SALUT_SI_BYTESTREAM_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), SALUT_TYPE_SI_BYTESTREAM_MANAGER, \
+ SalutSiBytestreamManagerClass))
+#define SALUT_IS_SI_BYTESTREAM_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), SALUT_TYPE_SI_BYTESTREAM_MANAGER))
+#define SALUT_IS_SI_BYTESTREAM_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), SALUT_TYPE_SI_BYTESTREAM_MANAGER))
+#define SALUT_SI_BYTESTREAM_MANAGER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), SALUT_TYPE_SI_BYTESTREAM_MANAGER, \
+ SalutSiBytestreamManagerClass))
+
+typedef void (* SalutSiBytestreamManagerNegotiateReplyFunc) (
GibberBytestreamIface *bytestream, const gchar *stream_id,
GibberXmppStanza *stanza, gpointer user_data);
-SalutBytestreamManager *
-salut_bytestream_manager_new (SalutConnection *connection,
+SalutSiBytestreamManager *
+salut_si_bytestream_manager_new (SalutConnection *connection,
const gchar *host_name_fqdn);
GibberXmppStanza *
-salut_bytestream_manager_make_stream_init_iq (const gchar *from,
+salut_si_bytestream_manager_make_stream_init_iq (const gchar *from,
const gchar *to, const gchar *stream_id, const gchar *profile);
gboolean
-salut_bytestream_manager_negotiate_stream (SalutBytestreamManager *self,
+salut_si_bytestream_manager_negotiate_stream (SalutSiBytestreamManager *self,
SalutContact *contact, GibberXmppStanza *stanza, const gchar *stream_id,
- SalutBytestreamManagerNegotiateReplyFunc func, gpointer user_data,
+ SalutSiBytestreamManagerNegotiateReplyFunc func, gpointer user_data,
GError **error);
-#endif /* #ifndef __SALUT_BYTESTREAM_MANAGER_H__*/
+#endif /* #ifndef __SALUT_SI_BYTESTREAM_MANAGER_H__*/
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 0d41c69..3deea50 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -372,7 +372,7 @@ start_stream_initiation (SalutTubeStream *self,
struct _extra_bytestream_negotiate_cb_data *data;
SalutContact *contact;
SalutContactManager *contact_mgr;
- SalutBytestreamManager *bytestream_mgr;
+ SalutSiBytestreamManager *bytestream_mgr;
contact_repo = tp_base_connection_get_handles (
(TpBaseConnection*) priv->conn, TP_HANDLE_TYPE_CONTACT);
@@ -381,7 +381,7 @@ start_stream_initiation (SalutTubeStream *self,
stream_id = generate_stream_id (self);
- msg = salut_bytestream_manager_make_stream_init_iq (priv->conn->name, jid,
+ msg = salut_si_bytestream_manager_make_stream_init_iq (priv->conn->name, jid,
stream_id, GIBBER_TELEPATHY_NS_TUBES);
si_node = gibber_xmpp_node_get_child_ns (msg->node, "si", GIBBER_XMPP_NS_SI);
@@ -427,7 +427,7 @@ start_stream_initiation (SalutTubeStream *self,
}
else
{
- result = salut_bytestream_manager_negotiate_stream (
+ result = salut_si_bytestream_manager_negotiate_stream (
bytestream_mgr,
contact,
msg,
--
1.5.6.5
More information about the Telepathy-commits
mailing list