Menu
▾
▴
tapioca-voip-commits — Repository update messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(252) |
Apr
(55) |
May
(45) |
Jun
(82) |
Jul
(69) |
Aug
(176) |
Sep
(255) |
Oct
(122) |
Nov
(76) |
Dec
(66) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(82) |
Feb
(56) |
Mar
(73) |
Apr
(254) |
May
(203) |
Jun
(31) |
Jul
(19) |
Aug
(9) |
Sep
(2) |
Oct
(22) |
Nov
(2) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(15) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ab...@us...> - 2008-03-25 20:02:20
|
Revision: 2109
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2109&view=rev
Author: abnerf
Date: 2008-03-25 13:02:24 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- Added functions to control the stream engine.
Modified Paths:
--------------
trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs
Modified: trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs
===================================================================
--- trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs 2008-03-25 14:05:05 UTC (rev 2108)
+++ trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs 2008-03-25 20:02:24 UTC (rev 2109)
@@ -54,4 +54,14 @@
(return-type "const-GList*")
)
+(define-method start_engine
+ (of-object "TpaStreamChannel")
+ (c-name "tpa_stream_channel_start_engine")
+ (return-type "gboolean")
+)
+(define-method stop_engine
+ (of-object "TpaStreamChannel")
+ (c-name "tpa_stream_channel_stop_engine")
+ (return-type "gboolean")
+)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-25 14:05:14
|
Revision: 2108
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2108&view=rev
Author: abnerf
Date: 2008-03-25 07:05:05 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- Some names changed due to new telepathy-qt.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/include/QtTapioca/audiostream.h
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/audiostream.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/audiostream.h 2008-03-25 14:02:13 UTC (rev 2107)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/audiostream.h 2008-03-25 14:05:05 UTC (rev 2108)
@@ -24,7 +24,7 @@
#include <QtCore/QObject>
#include <QtTapioca/Stream>
#include <QtTelepathy/Client/StreamEngine>
-#include <QtTelepathy/Client/ChannelStreamedMedia>
+#include <QtTelepathy/Client/Channel_Type_Streamed_Media>
namespace QtTapioca {
@@ -46,8 +46,8 @@
private:
friend class StreamChannel;
- AudioStream(org::freedesktop::Telepathy::ChannelStreamedMedia *sm, org::freedesktop::Telepathy::StreamEngine *se, uint id, uint contact, uint type, QObject *parent);
- AudioStream(org::freedesktop::Telepathy::ChannelStreamedMedia *sm, org::freedesktop::Telepathy::StreamEngine *se, uint id, uint contact, uint type, uint state, uint direction, uint flags, QObject *parent);
+ AudioStream(org::freedesktop::Telepathy::ChannelTypeStreamedMedia *sm, org::freedesktop::Telepathy::StreamEngine *se, uint id, uint contact, uint type, QObject *parent);
+ AudioStream(org::freedesktop::Telepathy::ChannelTypeStreamedMedia *sm, org::freedesktop::Telepathy::StreamEngine *se, uint id, uint contact, uint type, uint state, uint direction, uint flags, QObject *parent);
AudioStreamPrivate *d;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-25 14:02:13
|
Revision: 2107
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2107&view=rev
Author: abnerf
Date: 2008-03-25 07:02:13 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- StreamedMedia names changed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/stream.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/stream.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/stream.cpp 2008-03-25 13:55:38 UTC (rev 2106)
+++ branches/work/tapioca-qt-autogen-port/src/stream.cpp 2008-03-25 14:02:13 UTC (rev 2107)
@@ -29,7 +29,7 @@
class StreamPrivate {
public:
- StreamPrivate(org::freedesktop::Telepathy::ChannelStreamedMedia *sm)
+ StreamPrivate(org::freedesktop::Telepathy::ChannelTypeStreamedMedia *sm)
: telepathyStreamedMedia(sm)
{
}
@@ -37,14 +37,14 @@
{
}
- org::freedesktop::Telepathy::ChannelStreamedMedia *telepathyStreamedMedia;
+ org::freedesktop::Telepathy::ChannelTypeStreamedMedia *telepathyStreamedMedia;
};
}
using namespace QtTapioca;
-Stream::Stream(org::freedesktop::Telepathy::ChannelStreamedMedia *sm,
+Stream::Stream(org::freedesktop::Telepathy::ChannelTypeStreamedMedia *sm,
uint id, uint contact, uint type, uint state,
uint direction, uint flags, QObject *parent)
: QObject(parent),
@@ -64,7 +64,7 @@
this, SLOT(onStreamStateChanged(uint, uint)));
}
-Stream::Stream(org::freedesktop::Telepathy::ChannelStreamedMedia *sm,
+Stream::Stream(org::freedesktop::Telepathy::ChannelTypeStreamedMedia *sm,
uint id, uint contact, uint type, QObject *parent)
: QObject(parent),
m_id(id),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-25 13:55:34
|
Revision: 2106
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2106&view=rev
Author: abnerf
Date: 2008-03-25 06:55:38 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- New telepathy types changed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/contactgroup.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/contactgroup.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/contactgroup.cpp 2008-03-25 13:52:47 UTC (rev 2105)
+++ branches/work/tapioca-qt-autogen-port/src/contactgroup.cpp 2008-03-25 13:55:38 UTC (rev 2106)
@@ -27,7 +27,7 @@
#include "QtTapioca/ContactList"
#include "QtTapioca/Handle"
-#include <QtTelepathy/Client/ChannelGroupInterface>
+#include <QtTelepathy/Client/Channel_Interface_Group>
namespace QtTapioca {
@@ -39,7 +39,7 @@
Channel * chan)
: conn(connection), channel(chan)
{
- telepathyIChannelGroup = new org::freedesktop::Telepathy::ChannelGroupInterface(serviceName, objPath, QDBusConnection::sessionBus());
+ telepathyIChannelGroup = new org::freedesktop::Telepathy::ChannelInterfaceGroup(serviceName, objPath, QDBusConnection::sessionBus());
if (telepathyIChannelGroup)
flags |= telepathyIChannelGroup->GetGroupFlags();
@@ -52,7 +52,7 @@
uint flags;
Connection *conn;
Channel * channel;
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyIChannelGroup;
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyIChannelGroup;
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-25 13:52:47
|
Revision: 2105
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2105&view=rev
Author: abnerf
Date: 2008-03-25 06:52:47 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- ChannelText names changed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/textchannel.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/textchannel.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/textchannel.cpp 2008-03-25 13:45:35 UTC (rev 2104)
+++ branches/work/tapioca-qt-autogen-port/src/textchannel.cpp 2008-03-25 13:52:47 UTC (rev 2105)
@@ -30,8 +30,8 @@
#include "QtTapioca/Connection"
#include <QtTelepathy/Client/Channel>
-#include <QtTelepathy/Client/ChannelText>
-#include <QtTelepathy/Client/ChannelChatStateInterface>
+#include <QtTelepathy/Client/Channel_Type_Text>
+#include <QtTelepathy/Client/Channel_Interface_Chat_State>
namespace QtTapioca {
@@ -42,7 +42,7 @@
currentChatState(TextChannel::Inactive),
iChatState(NULL)
{
- ch = new org::freedesktop::Telepathy::ChannelText(serviceName, objPath, QDBusConnection::sessionBus());
+ ch = new org::freedesktop::Telepathy::ChannelTypeText(serviceName, objPath, QDBusConnection::sessionBus());
loadInterfaces(serviceName, objPath);
}
@@ -59,8 +59,8 @@
if (_channel) {
QStringList interfaces = _channel->GetInterfaces();
- if (interfaces.contains(org::freedesktop::Telepathy::ChannelChatStateInterface::staticInterfaceName()))
- iChatState = new org::freedesktop::Telepathy::ChannelChatStateInterface(ch->service(), ch->path(), QDBusConnection::sessionBus());
+ if (interfaces.contains(org::freedesktop::Telepathy::ChannelInterfaceChatState::staticInterfaceName()))
+ iChatState = new org::freedesktop::Telepathy::ChannelInterfaceChatState(ch->service(), ch->path(), QDBusConnection::sessionBus());
delete _channel;
}
@@ -68,8 +68,8 @@
Connection *conn;
TextChannel::ChatState currentChatState;
- org::freedesktop::Telepathy::ChannelText *ch;
- org::freedesktop::Telepathy::ChannelChatStateInterface *iChatState;
+ org::freedesktop::Telepathy::ChannelTypeText *ch;
+ org::freedesktop::Telepathy::ChannelInterfaceChatState *iChatState;
};
}
@@ -114,8 +114,8 @@
Q_ASSERT(d->ch);
QList<TextChannel::Message> ret;
- org::freedesktop::Telepathy::TextMessageInfo msgInfo;
- QDBusReply<org::freedesktop::Telepathy::TextMessageInfoList> reply = d->ch->ListPendingMessages(false);
+ org::freedesktop::Telepathy::PendingTextMessage msgInfo;
+ QDBusReply<QList<org::freedesktop::Telepathy::PendingTextMessage> > reply = d->ch->ListPendingMessages(false);
if (!reply.isValid()) {
qDebug() << "error getting pending messages:" << reply.error().message();
@@ -123,7 +123,7 @@
}
foreach (msgInfo, reply.value())
- ret << Message(msgInfo.message, msgInfo.timestamp, static_cast<TextChannel::Message::Type>(msgInfo.type), msgInfo.id, true);
+ ret << Message(msgInfo.text, msgInfo.unixTimestamp, static_cast<TextChannel::Message::Type>(msgInfo.messageType), msgInfo.identifier, true);
return ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-25 13:45:28
|
Revision: 2104
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2104&view=rev
Author: abnerf
Date: 2008-03-25 06:45:35 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- Interfaces names changed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/contactlist.cpp
branches/work/tapioca-qt-autogen-port/src/usercontact.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/contactlist.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/contactlist.cpp 2008-03-25 13:15:24 UTC (rev 2103)
+++ branches/work/tapioca-qt-autogen-port/src/contactlist.cpp 2008-03-25 13:45:35 UTC (rev 2104)
@@ -33,8 +33,8 @@
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusConnectionInterface>
#include <QtTelepathy/Client/Channel>
-#include <QtTelepathy/Client/ChannelContactList>
-#include <QtTelepathy/Client/ChannelGroupInterface>
+#include <QtTelepathy/Client/Channel_Type_Contact_List>
+#include <QtTelepathy/Client/Channel_Interface_Group>
#include <QtTelepathy/Client/Connection>
enum ListType {
@@ -51,11 +51,11 @@
/*
* Stores a single telepathy contact list (e.g. "subscribe")
*/
-class ContactListInternal: public org::freedesktop::Telepathy::ChannelGroupInterface
+class ContactListInternal: public org::freedesktop::Telepathy::ChannelInterfaceGroup
{
public:
ContactListInternal(const QString &serviceName, const QString &objPath, Handle *h)
- : org::freedesktop::Telepathy::ChannelGroupInterface(serviceName, objPath, QDBusConnection::sessionBus()),
+ : org::freedesktop::Telepathy::ChannelInterfaceGroup(serviceName, objPath, QDBusConnection::sessionBus()),
handle(h)
{
}
@@ -74,10 +74,10 @@
class ContactListPrivate {
public:
ContactListPrivate(org::freedesktop::Telepathy::Connection *conn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *iAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *iPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *iAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *iCapabilities,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *iAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *iPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *iAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *iCapabilities,
HandleFactory *hFactory)
: telepathyConn(conn),
telepathyIAvatar(iAvatar),
@@ -132,10 +132,10 @@
}
org::freedesktop::Telepathy::Connection *telepathyConn;
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *telepathyIAvatar;
- org::freedesktop::Telepathy::ConnectionPresenceInterface *telepathyIPresence;
- org::freedesktop::Telepathy::ConnectionAliasingInterface *telepathyIAliasing;
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *telepathyICapabilities;
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *telepathyIAvatar;
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *telepathyIPresence;
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *telepathyIAliasing;
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *telepathyICapabilities;
ContactListInternal *lists[CONTACT_LIST_TYPE_LAST];
QHash<uint, Contact *> contacts;
HandleFactory *handleFactory;
@@ -150,10 +150,10 @@
* Constructor
*/
ContactList::ContactList(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *iAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *iPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *iAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *iCapabilities,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *iAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *iPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *iAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *iCapabilities,
HandleFactory *handleFactory,
QObject *parent)
: QObject(parent),
Modified: branches/work/tapioca-qt-autogen-port/src/usercontact.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/usercontact.cpp 2008-03-25 13:15:24 UTC (rev 2103)
+++ branches/work/tapioca-qt-autogen-port/src/usercontact.cpp 2008-03-25 13:45:35 UTC (rev 2104)
@@ -53,10 +53,10 @@
using namespace QtTapioca;
UserContact::UserContact(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *iAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *iPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *iAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *iCapabilities,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *iAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *iPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *iAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *iCapabilities,
Handle *handle,
QObject *parent)
: ContactBase(telepathyConn, iAvatar, iPresence, iAliasing, iCapabilities, handle, parent),
@@ -153,8 +153,8 @@
return false;
QStringList remove;
- org::freedesktop::Telepathy::LocalCapabilityInfoList add;
- QDBusReply<org::freedesktop::Telepathy::LocalCapabilityInfoList> reply;
+ QList<org::freedesktop::Telepathy::CapabilityPair> add;
+ QDBusReply<QList<org::freedesktop::Telepathy::CapabilityPair> > reply;
/* Reset all caps */
remove << "org.freedesktop.Telepathy.Channel.Type.Text";
@@ -169,7 +169,7 @@
//Check if Text is supported
if (caps.contains(ContactBase::Text)) {
- org::freedesktop::Telepathy::LocalCapabilityInfo capInfo;
+ org::freedesktop::Telepathy::CapabilityPair capInfo;
capInfo.channelType = "org.freedesktop.Telepathy.Channel.Type.Text";
add << capInfo;
}
@@ -177,7 +177,7 @@
//Check if Audio and video are supported
if ((caps.contains(ContactBase::Audio)) ||
(caps.contains(ContactBase::Video))) {
- org::freedesktop::Telepathy::LocalCapabilityInfo capInfo;
+ org::freedesktop::Telepathy::CapabilityPair capInfo;
capInfo.channelType = "org.freedesktop.Telepathy.Channel.Type.StreamedMedia";
if (caps.contains(ContactBase::Audio))
@@ -203,13 +203,13 @@
void UserContact::setPresenceStatus(const QString &presenceStr, const QString &message)
{
QMap<QString, QVariant> opt;
- org::freedesktop::Telepathy::PresenceState presenceStatus;
+ org::freedesktop::Telepathy::MultipleStatusMap statusMap;
opt.insert("message", message);
- presenceStatus.insert(presenceStr, opt);
+ statusMap.insert(presenceStr, opt);
- QDBusReply<void> reply = telepathyIPresence->SetStatus(presenceStatus);
+ QDBusReply<void> reply = telepathyIPresence->SetStatus(statusMap);
if (!reply.isValid())
qDebug() << "error setting presence status:" << reply.error().message();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-25 13:15:24
|
Revision: 2103
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2103&view=rev
Author: abnerf
Date: 2008-03-25 06:15:24 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- Alias and Capability names fixed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/contactbase.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/contactbase.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/contactbase.cpp 2008-03-25 13:02:04 UTC (rev 2102)
+++ branches/work/tapioca-qt-autogen-port/src/contactbase.cpp 2008-03-25 13:15:24 UTC (rev 2103)
@@ -233,11 +233,11 @@
d->caps.clear();
- QDBusReply<org::freedesktop::Telepathy::CapabilityInfoList> reply = telepathyICapabilities->GetCapabilities(QList<uint>() << handle()->id());
+ QDBusReply<QList <org::freedesktop::Telepathy::ContactCapability> > reply = telepathyICapabilities->GetCapabilities(QList<uint>() << handle()->id());
if (!reply.isValid())
qDebug() << "error getting capabilities:" << reply.error().message();
else {
- org::freedesktop::Telepathy::CapabilityInfo capInfo;
+ org::freedesktop::Telepathy::ContactCapability capInfo;
foreach (capInfo, reply.value())
updateCapabilities(capInfo.channelType, capInfo.typeSpecificFlags);
}
@@ -287,25 +287,25 @@
}
}
-void ContactBase::onAliasChanged(org::freedesktop::Telepathy::AliasInfoList aliases)
+void ContactBase::onAliasChanged(QList< org::freedesktop::Telepathy::AliasPair > aliases)
{
uint id = handle()->id();
- org::freedesktop::Telepathy::AliasInfo aliasInfo;
+ org::freedesktop::Telepathy::AliasPair aliasInfo;
foreach (aliasInfo, aliases)
- if (aliasInfo.contactHandle == id) {
- d->alias = aliasInfo.newAlias;
+ if (aliasInfo.handle == id) {
+ d->alias = aliasInfo.alias;
emit aliasChanged(this, d->alias);
}
}
-void ContactBase::onCapabilitiesChanged(org::freedesktop::Telepathy::CapabilitiesChangedInfoList caps)
+void ContactBase::onCapabilitiesChanged(QList <org::freedesktop::Telepathy::CapabilityChange> caps)
{
uint id = handle()->id();
- org::freedesktop::Telepathy::CapabilitiesChangedInfo cap;
+ org::freedesktop::Telepathy::CapabilityChange cap;
foreach (cap, caps)
- if (cap.contactHandle == id)
+ if (cap.handle == id)
updateCapabilities(cap.channelType, cap.newTypeSpecificFlags);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-25 13:02:08
|
Revision: 2102
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2102&view=rev
Author: abnerf
Date: 2008-03-25 06:02:04 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
- onPresenceUpdated() signal fixed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/contactbase.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/contactbase.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/contactbase.cpp 2008-03-17 17:26:56 UTC (rev 2101)
+++ branches/work/tapioca-qt-autogen-port/src/contactbase.cpp 2008-03-25 13:02:04 UTC (rev 2102)
@@ -167,12 +167,12 @@
return d->currentToken;
}
-void ContactBase::onPresenceUpdated(org::freedesktop::Telepathy::PresenceStateInTimeMap newPresence)
+void ContactBase::onPresenceUpdated(org::freedesktop::Telepathy::ContactPresences newPresence)
{
if (newPresence.contains(handle()->id())) {
- org::freedesktop::Telepathy::PresenceStateInTime stateInTime = newPresence[handle()->id()];
- m_presence = strToPresenceEnum(stateInTime.state.begin().key());
- m_presenceMessage = (stateInTime.state.begin().value())["message"].toString();
+ org::freedesktop::Telepathy::LastActivityAndStatuses stateInTime = newPresence[handle()->id()];
+ m_presence = strToPresenceEnum(stateInTime.statuses.begin().key());
+ m_presenceMessage = (stateInTime.statuses.begin().value())["message"].toString();
emit presenceUpdated(this, m_presence, m_presenceMessage);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-17 17:26:51
|
Revision: 2101
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2101&view=rev
Author: abnerf
Date: 2008-03-17 10:26:56 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
- Interface names changed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/contactbase.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/contactbase.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/contactbase.cpp 2008-03-14 21:46:50 UTC (rev 2100)
+++ branches/work/tapioca-qt-autogen-port/src/contactbase.cpp 2008-03-17 17:26:56 UTC (rev 2101)
@@ -51,10 +51,10 @@
using namespace QtTapioca;
ContactBase::ContactBase(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *iAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *iPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *iAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *iCapabilities,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *iAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *iPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *iAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *iCapabilities,
Handle *contact_handle,
QObject *parent)
: ChannelTarget(contact_handle, parent),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-14 21:46:44
|
Revision: 2100
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2100&view=rev
Author: abnerf
Date: 2008-03-14 14:46:50 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
- More type names changed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/connectionmanager.cpp
branches/work/tapioca-qt-autogen-port/src/connectionmanagerfactory.cpp
branches/work/tapioca-qt-autogen-port/src/contact.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/connectionmanager.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/connectionmanager.cpp 2008-03-14 21:11:46 UTC (rev 2099)
+++ branches/work/tapioca-qt-autogen-port/src/connectionmanager.cpp 2008-03-14 21:46:50 UTC (rev 2100)
@@ -34,7 +34,7 @@
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusConnectionInterface>
#include <QtDBus/QDBusMetaType>
-#include <QtTelepathy/Client/ConnectionManager>
+#include <QtTelepathy/Client/Connection_Manager>
#define CONNECTION_MANAGER_BUS_NAME_PREFIX "org.freedesktop.Telepathy.ConnectionManager."
#define CONNECTION_MANAGER_OBJECT_PATH_PREFIX "/org/freedesktop/Telepathy/ConnectionManager/"
Modified: branches/work/tapioca-qt-autogen-port/src/connectionmanagerfactory.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/connectionmanagerfactory.cpp 2008-03-14 21:11:46 UTC (rev 2099)
+++ branches/work/tapioca-qt-autogen-port/src/connectionmanagerfactory.cpp 2008-03-14 21:46:50 UTC (rev 2100)
@@ -27,13 +27,13 @@
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtDBus/QDBusMetaType>
-#include <QtTelepathy/Common/BaseTypes>
-#include <QtTelepathy/Common/ConnectionPresenceInterfaceTypes>
-#include <QtTelepathy/Common/ConnectionCapabilitiesInterfaceTypes>
-#include <QtTelepathy/Common/ConnectionAliasingInterfaceTypes>
-#include <QtTelepathy/Common/ConnectionTypes>
-#include <QtTelepathy/Common/ChannelTextTypes>
-#include <QtTelepathy/Common/ChannelStreamedMediaTypes>
+//#include <QtTelepathy/Common/BaseTypes> FIXME - Check why it doesn't exists anymore.
+#include <QtTelepathy/Common/Connection_Interface_Presence_Types>
+#include <QtTelepathy/Common/Connection_Interface_Capabilities_Types>
+#include <QtTelepathy/Common/Connection_Interface_Aliasing_Types>
+#include <QtTelepathy/Common/Connection_Types>
+#include <QtTelepathy/Common/Channel_Type_Text_Types>
+#include <QtTelepathy/Common/Channel_Type_Streamed_Media_Types>
using namespace QtTapioca;
@@ -140,7 +140,8 @@
{
static bool registered = false;
if (!registered) {
- qDBusRegisterMetaType<QVariantMap>();
+ //TODO - Register all new types here
+/* qDBusRegisterMetaType<QVariantMap>();
qDBusRegisterMetaType<org::freedesktop::Telepathy::PresenceState>();
qDBusRegisterMetaType<org::freedesktop::Telepathy::PresenceStateInTime>();
qDBusRegisterMetaType<org::freedesktop::Telepathy::PresenceStateInTimeMap>();
@@ -158,7 +159,7 @@
qDBusRegisterMetaType<org::freedesktop::Telepathy::TextMessageInfo>();
qDBusRegisterMetaType<org::freedesktop::Telepathy::TextMessageInfoList>();
qDBusRegisterMetaType<org::freedesktop::Telepathy::StreamInfo>();
- qDBusRegisterMetaType<org::freedesktop::Telepathy::StreamInfoList>();
+ qDBusRegisterMetaType<org::freedesktop::Telepathy::StreamInfoList>();*/
registered = true;
}
}
Modified: branches/work/tapioca-qt-autogen-port/src/contact.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/contact.cpp 2008-03-14 21:11:46 UTC (rev 2099)
+++ branches/work/tapioca-qt-autogen-port/src/contact.cpp 2008-03-14 21:46:50 UTC (rev 2100)
@@ -32,11 +32,11 @@
class ContactPrivate {
public:
ContactPrivate(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ChannelGroupInterface *_telepathyGISubscribe,
- org::freedesktop::Telepathy::ChannelGroupInterface *_telepathyGIPublish,
- org::freedesktop::Telepathy::ChannelGroupInterface *_telepathyGIHide,
- org::freedesktop::Telepathy::ChannelGroupInterface *_telepathyGIAllow,
- org::freedesktop::Telepathy::ChannelGroupInterface *_telepathyGIDeny)
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *_telepathyGISubscribe,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *_telepathyGIPublish,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *_telepathyGIHide,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *_telepathyGIAllow,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *_telepathyGIDeny)
: hideFrom(false),
blocked(false),
subStatus(Contact::NotSubscribed),
@@ -59,11 +59,11 @@
org::freedesktop::Telepathy::Connection *telepathyConn;
Contact::SubscriptionStatus subStatus;
Contact::AuthorizationStatus authStatus;
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGISubscribe;
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIPublish;
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIHide;
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIAllow;
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIDeny;
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGISubscribe;
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIPublish;
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIHide;
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIAllow;
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIDeny;
};
}
@@ -71,15 +71,15 @@
using namespace QtTapioca;
Contact::Contact(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *telepathyIAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *telepathyIPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *telepathyIAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *telepathyICapabilities,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGISubscribe,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIPublish,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIHide,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIAllow,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIDeny,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *telepathyIAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *telepathyIPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *telepathyIAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *telepathyICapabilities,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGISubscribe,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIPublish,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIHide,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIAllow,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIDeny,
Handle *handle,
QObject *parent)
: ContactBase(telepathyConn,
@@ -247,7 +247,7 @@
emit blockStatusChanged(status);
}
-void Contact::setOnGroup(org::freedesktop::Telepathy::ChannelGroupInterface *group, bool value)
+void Contact::setOnGroup(org::freedesktop::Telepathy::ChannelInterfaceGroup *group, bool value)
{
d->mutex.lock();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-14 21:11:48
|
Revision: 2099
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2099&view=rev
Author: abnerf
Date: 2008-03-14 14:11:46 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
- channelInfo type fixed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/connection.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/connection.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/connection.cpp 2008-03-14 21:08:31 UTC (rev 2098)
+++ branches/work/tapioca-qt-autogen-port/src/connection.cpp 2008-03-14 21:11:46 UTC (rev 2099)
@@ -317,8 +317,8 @@
channelInfoList = d->conn->ListChannels();
foreach (channelInfo, channelInfoList) {
- incomingChannel(channelInfo.objectPath,
- channelInfo.interfaceName,
+ incomingChannel(channelInfo.channel,
+ channelInfo.channelType,
channelInfo.handleType,
channelInfo.handle,
true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-14 21:09:15
|
Revision: 2098
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2098&view=rev
Author: abnerf
Date: 2008-03-14 14:08:31 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
- channelInfoList type fixed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/src/connection.cpp
Modified: branches/work/tapioca-qt-autogen-port/src/connection.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/connection.cpp 2008-03-14 17:27:52 UTC (rev 2097)
+++ branches/work/tapioca-qt-autogen-port/src/connection.cpp 2008-03-14 21:08:31 UTC (rev 2098)
@@ -312,7 +312,7 @@
{ return; }
org::freedesktop::Telepathy::ChannelInfo channelInfo;
- org::freedesktop::Telepathy::ChannelInfoList channelInfoList;
+ QList< org::freedesktop::Telepathy::ChannelInfo > channelInfoList;
channelInfoList = d->conn->ListChannels();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-14 17:27:48
|
Revision: 2097
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2097&view=rev
Author: abnerf
Date: 2008-03-14 10:27:52 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
- Telepathy names changed. (port to telepathy-autogen)
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h
branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h
branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h
branches/work/tapioca-qt-autogen-port/include/QtTapioca/stream.h
branches/work/tapioca-qt-autogen-port/include/QtTapioca/usercontact.h
branches/work/tapioca-qt-autogen-port/src/connection.cpp
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h 2008-03-10 21:52:45 UTC (rev 2096)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h 2008-03-14 17:27:52 UTC (rev 2097)
@@ -86,22 +86,22 @@
friend class ContactList;
Contact(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *telepathyIAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *telepathyIPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *telepathyIAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *telepathyICapabilities,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGISubscribe,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIPublish,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIHide,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIAllow,
- org::freedesktop::Telepathy::ChannelGroupInterface *telepathyGIDeny,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *telepathyIAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *telepathyIPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *telepathyIAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *telepathyICapabilities,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGISubscribe,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIPublish,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIHide,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIAllow,
+ org::freedesktop::Telepathy::ChannelInterfaceGroup *telepathyGIDeny,
Handle *handle,
QObject *parent = 0);
void setSubscriptionStatus(SubscriptionStatus status, bool emitSignal = false);
void setAuthorizationStatus(AuthorizationStatus status, bool emitSignal = false);
void setHideStatus(bool status, bool emitSignal = false);
void setBlockStatus(bool status, bool emitSignal = false);
- void setOnGroup(org::freedesktop::Telepathy::ChannelGroupInterface *group, bool value);
+ void setOnGroup(org::freedesktop::Telepathy::ChannelInterfaceGroup *group, bool value);
ContactPrivate *d;
};
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h 2008-03-10 21:52:45 UTC (rev 2096)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h 2008-03-14 17:27:52 UTC (rev 2097)
@@ -34,6 +34,7 @@
#include <QtTelepathy/Client/Connection_Interface_Presence>
#include <QtTelepathy/Client/Connection_Interface_Aliasing>
#include <QtTelepathy/Client/Connection_Interface_Capabilities>
+
namespace QtTapioca {
class Avatar;
@@ -83,10 +84,10 @@
protected:
ContactBase(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *telepathyIAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *telepathyIPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *telepathyIAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *telepathyICapabilities,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *telepathyIAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *telepathyIPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *telepathyIAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *telepathyICapabilities,
Handle *contact_handle,
QObject *parent = 0);
@@ -97,16 +98,16 @@
ContactBase::Presence m_presence;
QString m_presenceMessage;
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *telepathyIAvatar;
- org::freedesktop::Telepathy::ConnectionPresenceInterface *telepathyIPresence;
- org::freedesktop::Telepathy::ConnectionAliasingInterface *telepathyIAliasing;
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *telepathyICapabilities;
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *telepathyIAvatar;
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *telepathyIPresence;
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *telepathyIAliasing;
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *telepathyICapabilities;
private Q_SLOTS:
- void onPresenceUpdated(org::freedesktop::Telepathy::PresenceStateInTimeMap newPresence);
+ void onPresenceUpdated(org::freedesktop::Telepathy::ContactPresences newPresence);
void onAvatarUpdated(uint contact, const QString &newAvatarToken);
- void onAliasChanged(org::freedesktop::Telepathy::AliasInfoList aliases);
- void onCapabilitiesChanged(org::freedesktop::Telepathy::CapabilitiesChangedInfoList caps);
+ void onAliasChanged(QList< org::freedesktop::Telepathy::AliasPair > aliases);
+ void onCapabilitiesChanged(QList< org::freedesktop::Telepathy::CapabilityChange > caps);
private:
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h 2008-03-10 21:52:45 UTC (rev 2096)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h 2008-03-14 17:27:52 UTC (rev 2097)
@@ -94,10 +94,10 @@
friend class ContactGroup;
ContactList(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *iAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *iPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *iAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *iCapabilities,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *iAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *iPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *iAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *iCapabilities,
HandleFactory *handleFactory,
QObject *parent = 0);
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/stream.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/stream.h 2008-03-10 21:52:45 UTC (rev 2096)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/stream.h 2008-03-14 17:27:52 UTC (rev 2097)
@@ -27,7 +27,7 @@
#include <QtCore/QString>
#include <qglobal.h>
-#include <QtTelepathy/Client/ChannelStreamedMedia>
+#include <QtTelepathy/Client/Channel_Type_Streamed_Media>
namespace QtTapioca {
@@ -67,8 +67,8 @@
void onStreamStateChanged(uint id, uint state);
protected:
- Stream(org::freedesktop::Telepathy::ChannelStreamedMedia *sm, uint id, uint contact, uint type, QObject *parent);
- Stream(org::freedesktop::Telepathy::ChannelStreamedMedia *sm, uint id, uint contact, uint type, uint state, uint direction, uint flags, QObject *parent);
+ Stream(org::freedesktop::Telepathy::ChannelTypeStreamedMedia *sm, uint id, uint contact, uint type, QObject *parent);
+ Stream(org::freedesktop::Telepathy::ChannelTypeStreamedMedia *sm, uint id, uint contact, uint type, uint state, uint direction, uint flags, QObject *parent);
uint m_id;
Type m_type;
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/usercontact.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/usercontact.h 2008-03-10 21:52:45 UTC (rev 2096)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/usercontact.h 2008-03-14 17:27:52 UTC (rev 2097)
@@ -28,10 +28,10 @@
#include <QtTapioca/ContactBase>
#include <QtTelepathy/Client/Connection>
-#include <QtTelepathy/Client/ConnectionAvatarsInterface>
-#include <QtTelepathy/Client/ConnectionPresenceInterface>
-#include <QtTelepathy/Client/ConnectionAliasingInterface>
-#include <QtTelepathy/Client/ConnectionCapabilitiesInterface>
+#include <QtTelepathy/Client/Connection_Interface_Avatars>
+#include <QtTelepathy/Client/Connection_Interface_Presence>
+#include <QtTelepathy/Client/Connection_Interface_Aliasing>
+#include <QtTelepathy/Client/Connection_Interface_Capabilities>
namespace QtTapioca {
@@ -56,10 +56,10 @@
private:
friend class Connection;
UserContact(org::freedesktop::Telepathy::Connection *telepathyConn,
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *iAvatar,
- org::freedesktop::Telepathy::ConnectionPresenceInterface *iPresence,
- org::freedesktop::Telepathy::ConnectionAliasingInterface *iAliasing,
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *iCapabilities,
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *iAvatar,
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *iPresence,
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *iAliasing,
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *iCapabilities,
Handle *handle, QObject *parent = 0);
void setPresenceStatus(const QString &presenceStr, const QString &message);
Modified: branches/work/tapioca-qt-autogen-port/src/connection.cpp
===================================================================
--- branches/work/tapioca-qt-autogen-port/src/connection.cpp 2008-03-10 21:52:45 UTC (rev 2096)
+++ branches/work/tapioca-qt-autogen-port/src/connection.cpp 2008-03-14 17:27:52 UTC (rev 2097)
@@ -39,10 +39,10 @@
#include <QtDBus/QDBusConnectionInterface>
#include <QtDBus/QDBusMetaType>
#include <QtTelepathy/Client/Connection>
-#include <QtTelepathy/Client/ConnectionAvatarsInterface>
-#include <QtTelepathy/Client/ConnectionPresenceInterface>
-#include <QtTelepathy/Client/ConnectionAliasingInterface>
-#include <QtTelepathy/Client/ConnectionCapabilitiesInterface>
+#include <QtTelepathy/Client/Connection_Interface_Avatars>
+#include <QtTelepathy/Client/Connection_Interface_Presence>
+#include <QtTelepathy/Client/Connection_Interface_Aliasing>
+#include <QtTelepathy/Client/Connection_Interface_Capabilities>
namespace QtTapioca {
@@ -86,26 +86,26 @@
{
QStringList interfaces = conn->GetInterfaces();
- if (interfaces.contains(org::freedesktop::Telepathy::ConnectionAvatarsInterface::staticInterfaceName()))
- iAvatar = new org::freedesktop::Telepathy::ConnectionAvatarsInterface(conn->service(), conn->path(), bus);
+ if (interfaces.contains(org::freedesktop::Telepathy::ConnectionInterfaceAvatars::staticInterfaceName()))
+ iAvatar = new org::freedesktop::Telepathy::ConnectionInterfaceAvatars(conn->service(), conn->path(), bus);
- if (interfaces.contains(org::freedesktop::Telepathy::ConnectionPresenceInterface::staticInterfaceName()))
- iPresence = new org::freedesktop::Telepathy::ConnectionPresenceInterface(conn->service(), conn->path(), bus);
+ if (interfaces.contains(org::freedesktop::Telepathy::ConnectionInterfacePresence::staticInterfaceName()))
+ iPresence = new org::freedesktop::Telepathy::ConnectionInterfacePresence(conn->service(), conn->path(), bus);
- if (interfaces.contains(org::freedesktop::Telepathy::ConnectionAliasingInterface::staticInterfaceName()))
- iAliasing = new org::freedesktop::Telepathy::ConnectionAliasingInterface(conn->service(), conn->path(), bus);
+ if (interfaces.contains(org::freedesktop::Telepathy::ConnectionInterfaceAliasing::staticInterfaceName()))
+ iAliasing = new org::freedesktop::Telepathy::ConnectionInterfaceAliasing(conn->service(), conn->path(), bus);
- if (interfaces.contains(org::freedesktop::Telepathy::ConnectionCapabilitiesInterface::staticInterfaceName()))
- iCapabilities = new org::freedesktop::Telepathy::ConnectionCapabilitiesInterface(conn->service(), conn->path(), bus);
+ if (interfaces.contains(org::freedesktop::Telepathy::ConnectionInterfaceCapabilities::staticInterfaceName()))
+ iCapabilities = new org::freedesktop::Telepathy::ConnectionInterfaceCapabilities(conn->service(), conn->path(), bus);
}
QDBusConnection bus;
QtTapioca::Connection * const parent;
org::freedesktop::Telepathy::Connection * const conn;
- org::freedesktop::Telepathy::ConnectionAvatarsInterface *iAvatar;
- org::freedesktop::Telepathy::ConnectionPresenceInterface *iPresence;
- org::freedesktop::Telepathy::ConnectionAliasingInterface *iAliasing;
- org::freedesktop::Telepathy::ConnectionCapabilitiesInterface *iCapabilities;
+ org::freedesktop::Telepathy::ConnectionInterfaceAvatars *iAvatar;
+ org::freedesktop::Telepathy::ConnectionInterfacePresence *iPresence;
+ org::freedesktop::Telepathy::ConnectionInterfaceAliasing *iAliasing;
+ org::freedesktop::Telepathy::ConnectionInterfaceCapabilities *iCapabilities;
uint status;
ContactList *cl;
ContactBase::Presence initialPresence;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-10 21:52:43
|
Revision: 2096
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2096&view=rev
Author: abnerf
Date: 2008-03-10 14:52:45 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
- Headers name changed.
Modified Paths:
--------------
branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h
branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h
branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h 2008-03-10 20:55:17 UTC (rev 2095)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/contact.h 2008-03-10 21:52:45 UTC (rev 2096)
@@ -29,11 +29,11 @@
#include <qglobal.h>
#include <QtTelepathy/Client/Connection>
-#include <QtTelepathy/Client/ConnectionAvatarsInterface>
-#include <QtTelepathy/Client/ConnectionPresenceInterface>
-#include <QtTelepathy/Client/ConnectionAliasingInterface>
-#include <QtTelepathy/Client/ConnectionCapabilitiesInterface>
-#include <QtTelepathy/Client/ChannelGroupInterface>
+#include <QtTelepathy/Client/Channel_Interface_Group>
+#include <QtTelepathy/Client/Connection_Interface_Avatars>
+#include <QtTelepathy/Client/Connection_Interface_Presence>
+#include <QtTelepathy/Client/Connection_Interface_Aliasing>
+#include <QtTelepathy/Client/Connection_Interface_Capabilities>
namespace QtTapioca {
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h 2008-03-10 20:55:17 UTC (rev 2095)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactbase.h 2008-03-10 21:52:45 UTC (rev 2096)
@@ -30,11 +30,10 @@
#include <QtTapioca/ChannelTarget>
#include <QtTelepathy/Client/Connection>
-#include <QtTelepathy/Client/ConnectionAvatarsInterface>
-#include <QtTelepathy/Client/ConnectionPresenceInterface>
-#include <QtTelepathy/Client/ConnectionAliasingInterface>
-#include <QtTelepathy/Client/ConnectionCapabilitiesInterface>
-
+#include <QtTelepathy/Client/Connection_Interface_Avatars>
+#include <QtTelepathy/Client/Connection_Interface_Presence>
+#include <QtTelepathy/Client/Connection_Interface_Aliasing>
+#include <QtTelepathy/Client/Connection_Interface_Capabilities>
namespace QtTapioca {
class Avatar;
Modified: branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h
===================================================================
--- branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h 2008-03-10 20:55:17 UTC (rev 2095)
+++ branches/work/tapioca-qt-autogen-port/include/QtTapioca/contactlist.h 2008-03-10 21:52:45 UTC (rev 2096)
@@ -28,10 +28,10 @@
#include <qglobal.h>
#include <QtTelepathy/Client/Connection>
-#include <QtTelepathy/Client/ConnectionAvatarsInterface>
-#include <QtTelepathy/Client/ConnectionPresenceInterface>
-#include <QtTelepathy/Client/ConnectionAliasingInterface>
-#include <QtTelepathy/Client/ConnectionCapabilitiesInterface>
+#include <QtTelepathy/Client/Connection_Interface_Avatars>
+#include <QtTelepathy/Client/Connection_Interface_Presence>
+#include <QtTelepathy/Client/Connection_Interface_Aliasing>
+#include <QtTelepathy/Client/Connection_Interface_Capabilities>
/** Namespace for Tapioca classes. */
namespace QtTapioca {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2008-03-10 20:55:16
|
Revision: 2095
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2095&view=rev
Author: abnerf
Date: 2008-03-10 13:55:17 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
Working branch to port to telepathy-qt-autogen
Added Paths:
-----------
branches/work/tapioca-qt-autogen-port/
Copied: branches/work/tapioca-qt-autogen-port (from rev 2094, trunk/tapioca-qt)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2007-11-26 18:19:55
|
Revision: 2066
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2066&view=rev
Author: abnerf
Date: 2007-11-26 10:19:57 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
- Fixed missing namespace.
Modified Paths:
--------------
trunk/tapioca-qt/include/QtTapioca/textchannel.h
Modified: trunk/tapioca-qt/include/QtTapioca/textchannel.h
===================================================================
--- trunk/tapioca-qt/include/QtTapioca/textchannel.h 2007-11-23 13:57:47 UTC (rev 2065)
+++ trunk/tapioca-qt/include/QtTapioca/textchannel.h 2007-11-26 18:19:57 UTC (rev 2066)
@@ -101,7 +101,7 @@
void messageDeliveryError(const QtTapioca::TextChannel::Message &message,
QtTapioca::TextChannel::Message::DeliveryError error);
void messageSent(const QtTapioca::TextChannel::Message &message);
- void chatStateChanged(const QtTapioca::TextChannel *tch, TextChannel::ChatState state);
+ void chatStateChanged(const QtTapioca::TextChannel *tch, QtTapioca::TextChannel::ChatState state);
private Q_SLOTS:
void onMessageReceived(uint id, uint timestamp, uint sender, uint type, uint flags, const QString &text);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bue...@us...> - 2007-11-23 13:57:45
|
Revision: 2065
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2065&view=rev
Author: bueroman
Date: 2007-11-23 05:57:47 -0800 (Fri, 23 Nov 2007)
Log Message:
-----------
tapioca-python updated.
Modified Paths:
--------------
trunk/tapioca-python/configure.ac
trunk/tapioca-python/tapioca/client/tapioca-channel.defs
trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs
trunk/tapioca-python/tapioca/generated-tapiocaclient-enums-gtypes.h
Modified: trunk/tapioca-python/configure.ac
===================================================================
--- trunk/tapioca-python/configure.ac 2007-10-23 21:23:14 UTC (rev 2064)
+++ trunk/tapioca-python/configure.ac 2007-11-23 13:57:47 UTC (rev 2065)
@@ -1,8 +1,8 @@
-AC_INIT(tapioca-python, 0.14.0)
+AC_INIT(tapioca-python, 0.14.1)
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(tapioca-python, TAPIOCA_PYTHON, 0, 14, 0, 0, TAPIOCA_PYTHON_CVS="no", TAPIOCA_PYTHON_CVS="yes")
+AS_VERSION(tapioca-python, TAPIOCA_PYTHON, 0, 14, 1, 0, TAPIOCA_PYTHON_CVS="no", TAPIOCA_PYTHON_CVS="yes")
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
Modified: trunk/tapioca-python/tapioca/client/tapioca-channel.defs
===================================================================
--- trunk/tapioca-python/tapioca/client/tapioca-channel.defs 2007-10-23 21:23:14 UTC (rev 2064)
+++ trunk/tapioca-python/tapioca/client/tapioca-channel.defs 2007-11-23 13:57:47 UTC (rev 2065)
@@ -41,18 +41,6 @@
(return-type "none")
)
-(define-method join
- (of-object "TpaChannel")
- (c-name "tpa_channel_join")
- (return-type "none")
-)
-
-(define-method has_joined
- (of-object "TpaChannel")
- (c-name "tpa_channel_has_joined")
- (return-type "gboolean")
-)
-
(define-method has_group_support
(of-object "TpaChannel")
(c-name "tpa_channel_has_group_support")
Modified: trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs
===================================================================
--- trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs 2007-10-23 21:23:14 UTC (rev 2064)
+++ trunk/tapioca-python/tapioca/client/tapioca-stream-channel.defs 2007-11-23 13:57:47 UTC (rev 2065)
@@ -23,6 +23,12 @@
(return-type "none")
)
+(define-method has_joined
+ (of-object "TpaStreamChannel")
+ (c-name "tpa_stream_channel_has_joined")
+ (return-type "gboolean")
+)
+
(define-method request_streams
(of-object "TpaStreamChannel")
(c-name "tpa_stream_channel_request_streams")
Modified: trunk/tapioca-python/tapioca/generated-tapiocaclient-enums-gtypes.h
===================================================================
--- trunk/tapioca-python/tapioca/generated-tapiocaclient-enums-gtypes.h 2007-10-23 21:23:14 UTC (rev 2064)
+++ trunk/tapioca-python/tapioca/generated-tapiocaclient-enums-gtypes.h 2007-11-23 13:57:47 UTC (rev 2065)
@@ -17,28 +17,8 @@
/* Generated data (by glib-mkenums) */
-
/* enumerations from "../../tapioca-glib/tapioca/client/tpa-enums.h" */
GType
-tpa_chat_state_get_type (void)
-{
- static GType etype = 0;
- if (etype == 0) {
- static const GEnumValue values[] = {
- { TPA_CHAT_STATE_GONE, "TPA_CHAT_STATE_GONE", "gone" },
- { TPA_CHAT_STATE_INACTIVE, "TPA_CHAT_STATE_INACTIVE", "inactive" },
- { TPA_CHAT_STATE_ACTIVE, "TPA_CHAT_STATE_ACTIVE", "active" },
- { TPA_CHAT_STATE_PAUSED, "TPA_CHAT_STATE_PAUSED", "paused" },
- { TPA_CHAT_STATE_COMPOSING, "TPA_CHAT_STATE_COMPOSING", "composing" },
- { 0, NULL, NULL }
- };
- etype = g_enum_register_static ("TpaChatState", values);
- }
- return etype;
-}
-
-
-GType
tpa_connection_status_get_type (void)
{
static GType etype = 0;
@@ -189,8 +169,9 @@
static GType etype = 0;
if (etype == 0) {
static const GEnumValue values[] = {
+ { TPA_STREAM_STATE_NONE, "TPA_STREAM_STATE_NONE", "none" },
{ TPA_STREAM_STATE_CONNECTING, "TPA_STREAM_STATE_CONNECTING", "connecting" },
- { TPA_STREAM_STATE_PAUSED, "TPA_STREAM_STATE_PAUSED", "paused" },
+ { TPA_STREAM_STATE_CONNECTED, "TPA_STREAM_STATE_CONNECTED", "connected" },
{ TPA_STREAM_STATE_PLAYING, "TPA_STREAM_STATE_PLAYING", "playing" },
{ 0, NULL, NULL }
};
@@ -200,6 +181,39 @@
}
GType
+tpa_stream_direction_get_type (void)
+{
+ static GType etype = 0;
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { TPA_STREAM_DIRECTION_NONE, "TPA_STREAM_DIRECTION_NONE", "none" },
+ { TPA_STREAM_DIRECTION_OUTPUT, "TPA_STREAM_DIRECTION_OUTPUT", "output" },
+ { TPA_STREAM_DIRECTION_INPUT, "TPA_STREAM_DIRECTION_INPUT", "input" },
+ { TPA_STREAM_DIRECTION_DUPLEX, "TPA_STREAM_DIRECTION_DUPLEX", "duplex" },
+ { 0, NULL, NULL }
+ };
+ etype = g_enum_register_static ("TpaStreamDirection", values);
+ }
+ return etype;
+}
+
+GType
+tpa_stream_flag_get_type (void)
+{
+ static GType etype = 0;
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { TPA_STREAM_FLAG_NONE, "TPA_STREAM_FLAG_NONE", "none" },
+ { TPA_STREAM_FLAG_LOCAL_PENDING, "TPA_STREAM_FLAG_LOCAL_PENDING", "local-pending" },
+ { TPA_STREAM_FLAG_REMOTE_PENDING, "TPA_STREAM_FLAG_REMOTE_PENDING", "remote-pending" },
+ { 0, NULL, NULL }
+ };
+ etype = g_enum_register_static ("TpaStreamFlag", values);
+ }
+ return etype;
+}
+
+GType
tpa_text_message_type_get_type (void)
{
static GType etype = 0;
@@ -237,6 +251,24 @@
}
GType
+tpa_chat_state_get_type (void)
+{
+ static GType etype = 0;
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { TPA_CHAT_STATE_GONE, "TPA_CHAT_STATE_GONE", "gone" },
+ { TPA_CHAT_STATE_INACTIVE, "TPA_CHAT_STATE_INACTIVE", "inactive" },
+ { TPA_CHAT_STATE_ACTIVE, "TPA_CHAT_STATE_ACTIVE", "active" },
+ { TPA_CHAT_STATE_PAUSED, "TPA_CHAT_STATE_PAUSED", "paused" },
+ { TPA_CHAT_STATE_COMPOSING, "TPA_CHAT_STATE_COMPOSING", "composing" },
+ { 0, NULL, NULL }
+ };
+ etype = g_enum_register_static ("TpaChatState", values);
+ }
+ return etype;
+}
+
+GType
tpa_handle_type_get_type (void)
{
static GType etype = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2007-10-23 21:23:10
|
Revision: 2064
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2064&view=rev
Author: abnerf
Date: 2007-10-23 14:23:14 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
- Receive message implemented.
Modified Paths:
--------------
trunk/tapioca-qt/tests/test.cpp
trunk/tapioca-qt/tests/test.h
Modified: trunk/tapioca-qt/tests/test.cpp
===================================================================
--- trunk/tapioca-qt/tests/test.cpp 2007-10-23 21:22:22 UTC (rev 2063)
+++ trunk/tapioca-qt/tests/test.cpp 2007-10-23 21:23:14 UTC (rev 2064)
@@ -137,7 +137,28 @@
void MessageFilter::onChannelCreated(Connection *connection, Channel *channel, bool suppress)
{
- if (channel->type() == Channel::Text)
- dynamic_cast<TextChannel*>(channel)->sendMessage("reply");
+ if (channel->type() == Channel::Text) {
+ TextChannel *tch = dynamic_cast<TextChannel*>(channel);
+
+ QList<TextChannel::Message> msgList = tch->pendingMessages();
+ foreach (TextChannel::Message m, msgList) {
+ qDebug() << m.contents();
+ tch->acknowledge(m);
+ }
+
+ QObject::connect(tch, SIGNAL(messageReceived(const QtTapioca::TextChannel *,
+ const QtTapioca::TextChannel::Message &)),
+ this,
+ SLOT(onMessageReceived(const QtTapioca::TextChannel *, const QtTapioca::TextChannel::Message &)));
+ }
}
+void MessageFilter::onMessageReceived(const TextChannel *tch, const TextChannel::Message &msg)
+{
+ TextChannel *t = const_cast<TextChannel*>(tch);
+
+ qDebug() << msg.contents();
+
+ t->sendMessage("reply");
+ t->acknowledge(msg);
+}
Modified: trunk/tapioca-qt/tests/test.h
===================================================================
--- trunk/tapioca-qt/tests/test.h 2007-10-23 21:22:22 UTC (rev 2063)
+++ trunk/tapioca-qt/tests/test.h 2007-10-23 21:23:14 UTC (rev 2064)
@@ -23,6 +23,7 @@
#include <QtCore/QObject>
#include <QtTapioca/Connection>
+#include <QtTapioca/TextChannel>
using namespace QtTapioca;
@@ -37,6 +38,7 @@
public Q_SLOTS:
void onStatusChanged(QtTapioca::Connection *connection, QtTapioca::Connection::Status status, QtTapioca::Connection::Reason reason);
void onChannelCreated(QtTapioca::Connection *connection, QtTapioca::Channel *channel, bool suppress);
+ void onMessageReceived(const QtTapioca::TextChannel *tch, const QtTapioca::TextChannel::Message &);
};
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2007-10-23 21:22:19
|
Revision: 2063
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2063&view=rev
Author: abnerf
Date: 2007-10-23 14:22:22 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
- Passing the TextChannel instance on messageReceived signal.
Modified Paths:
--------------
trunk/tapioca-qt/include/QtTapioca/textchannel.h
trunk/tapioca-qt/src/textchannel.cpp
Modified: trunk/tapioca-qt/include/QtTapioca/textchannel.h
===================================================================
--- trunk/tapioca-qt/include/QtTapioca/textchannel.h 2007-10-23 20:35:00 UTC (rev 2062)
+++ trunk/tapioca-qt/include/QtTapioca/textchannel.h 2007-10-23 21:22:22 UTC (rev 2063)
@@ -97,7 +97,7 @@
TextChannel::ChatState localChatState() const;
Q_SIGNALS:
- void messageReceived(const QtTapioca::TextChannel::Message &message);
+ void messageReceived(const QtTapioca::TextChannel *tch, const QtTapioca::TextChannel::Message &message);
void messageDeliveryError(const QtTapioca::TextChannel::Message &message,
QtTapioca::TextChannel::Message::DeliveryError error);
void messageSent(const QtTapioca::TextChannel::Message &message);
Modified: trunk/tapioca-qt/src/textchannel.cpp
===================================================================
--- trunk/tapioca-qt/src/textchannel.cpp 2007-10-23 20:35:00 UTC (rev 2062)
+++ trunk/tapioca-qt/src/textchannel.cpp 2007-10-23 21:22:22 UTC (rev 2063)
@@ -173,7 +173,7 @@
void TextChannel::onMessageReceived(uint id, uint timestamp, uint sender, uint type, uint flags, const QString &text)
{
Message msg(text, timestamp, static_cast<TextChannel::Message::Type>(type), id, true);
- emit messageReceived(msg);
+ emit messageReceived(this, msg);
}
void TextChannel::onSendError(uint error, uint timestamp, uint type, const QString &text)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2007-10-23 20:35:02
|
Revision: 2062
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2062&view=rev
Author: abnerf
Date: 2007-10-23 13:35:00 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
- Test updated.
Modified Paths:
--------------
trunk/tapioca-qt/tests/test.cpp
trunk/tapioca-qt/tests/test.h
Modified: trunk/tapioca-qt/tests/test.cpp
===================================================================
--- trunk/tapioca-qt/tests/test.cpp 2007-10-23 20:34:25 UTC (rev 2061)
+++ trunk/tapioca-qt/tests/test.cpp 2007-10-23 20:35:00 UTC (rev 2062)
@@ -104,8 +104,8 @@
MessageFilter messageFilter;
QObject::connect(conn, SIGNAL(statusChanged(QtTapioca::Connection *, QtTapioca::Connection::Status, QtTapioca::Connection::Reason)),
&messageFilter, SLOT(onStatusChanged(QtTapioca::Connection *, QtTapioca::Connection::Status, QtTapioca::Connection::Reason)));
- QObject::connect(conn, SIGNAL(channelCreated(QtTapioca::Connection *, QtTapioca::Channel *)),
- &messageFilter, SLOT(onChannelCreated(QtTapioca::Connection *, QtTapioca::Channel *)));
+ QObject::connect(conn, SIGNAL(channelCreated(QtTapioca::Connection *, QtTapioca::Channel *, bool)),
+ &messageFilter, SLOT(onChannelCreated(QtTapioca::Connection *, QtTapioca::Channel *, bool)));
conn->connect(ContactBase::Available);
return app.exec();
@@ -135,7 +135,7 @@
}
}
-void MessageFilter::onChannelCreated(Connection *connection, Channel *channel)
+void MessageFilter::onChannelCreated(Connection *connection, Channel *channel, bool suppress)
{
if (channel->type() == Channel::Text)
dynamic_cast<TextChannel*>(channel)->sendMessage("reply");
Modified: trunk/tapioca-qt/tests/test.h
===================================================================
--- trunk/tapioca-qt/tests/test.h 2007-10-23 20:34:25 UTC (rev 2061)
+++ trunk/tapioca-qt/tests/test.h 2007-10-23 20:35:00 UTC (rev 2062)
@@ -36,7 +36,7 @@
public Q_SLOTS:
void onStatusChanged(QtTapioca::Connection *connection, QtTapioca::Connection::Status status, QtTapioca::Connection::Reason reason);
- void onChannelCreated(QtTapioca::Connection *connection, QtTapioca::Channel *channel);
+ void onChannelCreated(QtTapioca::Connection *connection, QtTapioca::Channel *channel, bool suppress);
};
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ab...@us...> - 2007-10-23 20:34:25
|
Revision: 2061
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2061&view=rev
Author: abnerf
Date: 2007-10-23 13:34:25 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
- Small patch for iChatState.
Modified Paths:
--------------
trunk/tapioca-qt/src/textchannel.cpp
Modified: trunk/tapioca-qt/src/textchannel.cpp
===================================================================
--- trunk/tapioca-qt/src/textchannel.cpp 2007-10-20 15:15:43 UTC (rev 2060)
+++ trunk/tapioca-qt/src/textchannel.cpp 2007-10-23 20:34:25 UTC (rev 2061)
@@ -39,7 +39,8 @@
public:
TextChannelPrivate(Connection *_conn, const QString &serviceName, const QString &objPath)
:conn(_conn),
- currentChatState(TextChannel::Inactive)
+ currentChatState(TextChannel::Inactive),
+ iChatState(NULL)
{
ch = new org::freedesktop::Telepathy::ChannelText(serviceName, objPath, QDBusConnection::sessionBus());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lui...@us...> - 2007-10-20 15:15:41
|
Revision: 2060
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2060&view=rev
Author: luiz_dentz
Date: 2007-10-20 08:15:43 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
Fix engine stop.
Modified Paths:
--------------
trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c
Modified: trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c
===================================================================
--- trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c 2007-10-20 02:00:12 UTC (rev 2059)
+++ trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c 2007-10-20 15:15:43 UTC (rev 2060)
@@ -632,7 +632,7 @@
g_assert (self);
dbus_g_proxy_call (self->priv->engine_proxy, "Shutdown", &error,
- G_TYPE_INVALID);
+ G_TYPE_INVALID, G_TYPE_INVALID);
if (error) {
ERROR ("%s", error->message);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lui...@us...> - 2007-10-20 02:00:13
|
Revision: 2059
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2059&view=rev
Author: luiz_dentz
Date: 2007-10-19 19:00:12 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Add methods to start and stop media engine.
Modified Paths:
--------------
trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c
trunk/tapioca-glib/tapioca/client/tpa-stream-channel.h
trunk/tapioca-glib/tests/client-audio-channel.c
trunk/tapioca-glib/tests/client-video-channel.c
Modified: trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c
===================================================================
--- trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c 2007-10-19 21:29:38 UTC (rev 2058)
+++ trunk/tapioca-glib/tapioca/client/tpa-stream-channel.c 2007-10-20 02:00:12 UTC (rev 2059)
@@ -189,52 +189,6 @@
VERBOSE ("return");
}
-static gboolean
-tpa_stream_channel_handle_channel (TpaStreamChannel *self)
-{
- TpaUserContact *user;
- DBusGProxy *proxy;
- DBusGProxy *conn_proxy;
- const gchar *service_name;
- const gchar *conn_path;
- const gchar *channel_path;
- GError *error = NULL;
-
- VERBOSE ("(%p)", self);
- g_assert (self);
-
- g_object_get (TPA_CHANNEL (self), "user", &user, NULL);
- proxy = tpa_object_get_proxy (TPA_OBJECT (self), TPA_INTERFACE_CHANNEL);
- conn_proxy = tpa_object_get_proxy (TPA_OBJECT (user), TPA_INTERFACE_CONNECTION);
-
- service_name = dbus_g_proxy_get_bus_name (conn_proxy);
- conn_path = dbus_g_proxy_get_path (conn_proxy);
- channel_path = dbus_g_proxy_get_path (proxy);
- dbus_g_proxy_call (self->priv->channel_handler_proxy, "HandleChannel", &error,
- G_TYPE_STRING, service_name,
- DBUS_TYPE_G_OBJECT_PATH, conn_path,
- G_TYPE_STRING, TPA_INTERFACE_STREAMED_MEDIA,
- DBUS_TYPE_G_OBJECT_PATH, channel_path,
- G_TYPE_UINT, 0,
- G_TYPE_UINT, 0,
- G_TYPE_INVALID, G_TYPE_INVALID);
-
- if (error) {
- ERROR ("%s", error->message);
- g_error_free (error);
- VERBOSE ("return false");
- return FALSE;
- }
-
- INFO ("media stream %p handling channel %p", self, TPA_CHANNEL (self))
-
- g_object_unref (proxy);
- g_object_unref (conn_proxy);
-
- VERBOSE ("return true");
- return TRUE;
-}
-
void
tpa_stream_channel_update_stream_list (TpaStreamChannel *self)
{
@@ -369,9 +323,6 @@
G_CALLBACK (proxy_stream_receiving),
self);
- if (!tpa_stream_channel_handle_channel (self))
- ERROR ("failed to handle channel.");
-
tpa_stream_channel_update_stream_list (self);
return object;
@@ -625,3 +576,71 @@
g_array_free (streams, TRUE);
VERBOSE ("return");
}
+
+gboolean
+tpa_stream_channel_start_engine (TpaStreamChannel *self)
+{
+ TpaUserContact *user;
+ DBusGProxy *proxy;
+ DBusGProxy *conn_proxy;
+ const gchar *service_name;
+ const gchar *conn_path;
+ const gchar *channel_path;
+ GError *error = NULL;
+
+ VERBOSE ("(%p)", self);
+ g_assert (self);
+
+ g_object_get (TPA_CHANNEL (self), "user", &user, NULL);
+ proxy = tpa_object_get_proxy (TPA_OBJECT (self), TPA_INTERFACE_CHANNEL);
+ conn_proxy = tpa_object_get_proxy (TPA_OBJECT (user), TPA_INTERFACE_CONNECTION);
+
+ service_name = dbus_g_proxy_get_bus_name (conn_proxy);
+ conn_path = dbus_g_proxy_get_path (conn_proxy);
+ channel_path = dbus_g_proxy_get_path (proxy);
+ dbus_g_proxy_call (self->priv->channel_handler_proxy, "HandleChannel", &error,
+ G_TYPE_STRING, service_name,
+ DBUS_TYPE_G_OBJECT_PATH, conn_path,
+ G_TYPE_STRING, TPA_INTERFACE_STREAMED_MEDIA,
+ DBUS_TYPE_G_OBJECT_PATH, channel_path,
+ G_TYPE_UINT, 0,
+ G_TYPE_UINT, 0,
+ G_TYPE_INVALID, G_TYPE_INVALID);
+
+ if (error) {
+ ERROR ("%s", error->message);
+ g_error_free (error);
+ VERBOSE ("return false");
+ return FALSE;
+ }
+
+ INFO ("media stream %p handling channel %p", self, TPA_CHANNEL (self))
+
+ g_object_unref (proxy);
+ g_object_unref (conn_proxy);
+
+ VERBOSE ("return true");
+ return TRUE;
+}
+
+gboolean
+tpa_stream_channel_stop_engine (TpaStreamChannel *self)
+{
+ GError *error = NULL;
+
+ VERBOSE ("(%p)", self);
+ g_assert (self);
+
+ dbus_g_proxy_call (self->priv->engine_proxy, "Shutdown", &error,
+ G_TYPE_INVALID);
+
+ if (error) {
+ ERROR ("%s", error->message);
+ g_error_free (error);
+ VERBOSE ("return false");
+ return FALSE;
+ }
+
+ VERBOSE ("return true");
+ return TRUE;
+}
Modified: trunk/tapioca-glib/tapioca/client/tpa-stream-channel.h
===================================================================
--- trunk/tapioca-glib/tapioca/client/tpa-stream-channel.h 2007-10-19 21:29:38 UTC (rev 2058)
+++ trunk/tapioca-glib/tapioca/client/tpa-stream-channel.h 2007-10-20 02:00:12 UTC (rev 2059)
@@ -68,6 +68,8 @@
void tpa_stream_channel_remove_stream (TpaStreamChannel *self,
TpaStream *stream);
G_CONST_RETURN GList * tpa_stream_channel_get_streams (TpaStreamChannel *self);
+gboolean tpa_stream_channel_start_engine (TpaStreamChannel *self);
+gboolean tpa_stream_channel_stop_engine (TpaStreamChannel *self);
G_END_DECLS
Modified: trunk/tapioca-glib/tests/client-audio-channel.c
===================================================================
--- trunk/tapioca-glib/tests/client-audio-channel.c 2007-10-19 21:29:38 UTC (rev 2058)
+++ trunk/tapioca-glib/tests/client-audio-channel.c 2007-10-20 02:00:12 UTC (rev 2059)
@@ -183,6 +183,7 @@
GList *stream_list = (GList *)tpa_stream_channel_get_streams (stream);
GList *types = NULL;
+ tpa_stream_channel_start_engine (stream);
g_signal_connect (G_OBJECT (stream), "stream-added", G_CALLBACK (stream_created_cb), NULL);
if (stream_list) {
Modified: trunk/tapioca-glib/tests/client-video-channel.c
===================================================================
--- trunk/tapioca-glib/tests/client-video-channel.c 2007-10-19 21:29:38 UTC (rev 2058)
+++ trunk/tapioca-glib/tests/client-video-channel.c 2007-10-20 02:00:12 UTC (rev 2059)
@@ -215,6 +215,7 @@
GList *stream_list = (GList *) tpa_stream_channel_get_streams (stream);
GList *types = NULL;
+ tpa_stream_channel_start_engine (stream);
g_signal_connect (G_OBJECT (stream), "stream-added", G_CALLBACK (stream_created_cb), NULL);
if (stream_list)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lui...@us...> - 2007-10-19 21:29:36
|
Revision: 2058
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2058&view=rev
Author: luiz_dentz
Date: 2007-10-19 14:29:38 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Only emit signals if there is a change.
Modified Paths:
--------------
trunk/tapioca-glib/tapioca/client/tpa-stream.c
Modified: trunk/tapioca-glib/tapioca/client/tpa-stream.c
===================================================================
--- trunk/tapioca-glib/tapioca/client/tpa-stream.c 2007-10-19 17:00:20 UTC (rev 2057)
+++ trunk/tapioca-glib/tapioca/client/tpa-stream.c 2007-10-19 21:29:38 UTC (rev 2058)
@@ -426,6 +426,10 @@
VERBOSE ("(%p, %u)", self, state);
g_assert (self);
+
+ if (self->priv->state == state)
+ return;
+
self->priv->state = state;
g_signal_emit (self, tpa_stream_signals[STATE_CHANGED], 0, state);
INFO ("[stream-state-changed] stream:%d state:%d", self->priv->id, state);
@@ -441,6 +445,10 @@
VERBOSE ("(%p, %u, %u)", self, direction, flags);
g_assert (self);
+
+ if (self->priv->direction == direction)
+ return;
+
self->priv->direction = direction;
self->priv->flags = flags;
g_signal_emit (self, tpa_stream_signals[DIRECTION_CHANGED], 0, direction, flags);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lui...@us...> - 2007-10-19 17:00:28
|
Revision: 2057
http://tapioca-voip.svn.sourceforge.net/tapioca-voip/?rev=2057&view=rev
Author: luiz_dentz
Date: 2007-10-19 10:00:20 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Update signal marsharls.
Modified Paths:
--------------
trunk/tapioca-glib/tapioca/base/signals-marshal.list
trunk/tapioca-glib/tapioca/client/tpa-manager-factory.c
Modified: trunk/tapioca-glib/tapioca/base/signals-marshal.list
===================================================================
--- trunk/tapioca-glib/tapioca/base/signals-marshal.list 2007-10-19 16:22:12 UTC (rev 2056)
+++ trunk/tapioca-glib/tapioca/base/signals-marshal.list 2007-10-19 17:00:20 UTC (rev 2057)
@@ -3,6 +3,7 @@
VOID:STRING,STRING
VOID:UINT,UINT,UINT
VOID:UINT,UINT,STRING
+VOID:STRING,UINT,BOOLEAN
VOID:STRING,STRING,STRING
VOID:UINT,UINT,UINT,STRING
VOID:STRING,STRING,UINT,UINT,BOOLEAN
Modified: trunk/tapioca-glib/tapioca/client/tpa-manager-factory.c
===================================================================
--- trunk/tapioca-glib/tapioca/client/tpa-manager-factory.c 2007-10-19 16:22:12 UTC (rev 2056)
+++ trunk/tapioca-glib/tapioca/client/tpa-manager-factory.c 2007-10-19 17:00:20 UTC (rev 2057)
@@ -93,6 +93,8 @@
G_TYPE_NONE, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_object_register_marshaller (tpa_marshal_VOID__UINT_UINT_UINT,
G_TYPE_NONE, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID);
+ dbus_g_object_register_marshaller (tpa_marshal_VOID__STRING_UINT_BOOLEAN,
+ G_TYPE_NONE, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_INVALID);
if (!cms) {
cms = g_hash_table_new_full (g_str_hash,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|