connection_status(Connection::Disconnected),
adaptor(new ConnectionAdaptor(p)),
connIfaceReqsAdaptor(new ConnectionInterfaceRequestsAdaptor(p)),
+<<<<<<< HEAD
logUtility(new LogUtility(p)),
+=======
+ logUtility(new LogUtility("/var/log/vicar/vicar.log",p)),
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
parent(p)
{
Q_ASSERT(0 != adaptor);
QString strMessage;
strMessage = "DEBUG: In Connection Constructor";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
Q_ASSERT(0 != d);
this->setProperty("HasImmortalHandles",true);
this->setProperty("Status",org::freedesktop::Telepathy::CONNECTION_STATUS_CONNECTED);
+<<<<<<< HEAD
//this->setProperty("SelfHandle",org::freedesktop::Telepathy::HANDLE_TYPE_CONTACT);
strMessage = "VICaR Connection: Emitting SelfHandleChanged.";
d->logUtility->logMessage(strMessage);
emit SelfHandleChanged(selfHandle);
+=======
+ this->setProperty("SelfHandle",org::freedesktop::Telepathy::HANDLE_TYPE_CONTACT);
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
//Set the property RequestableChannelClasses
org::freedesktop::Telepathy::RequestableChannelClassList requestableChannelClasses;
//Set the property Channels
org::freedesktop::Telepathy::ChannelDetailsList channelDetails;
this->setProperty("Channels",QVariant::fromValue(channelDetails));
+<<<<<<< HEAD
+=======
+
+ //Set the connection status to Connected (default for Vicar)
+ d->connection_status = Connection::Connected;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
//Set the connection status to Connected (default for Vicar)
d->connection_status = Connection::Connected;
strMessage = "VICaR Connection: Connection set up.";
+<<<<<<< HEAD
+=======
+ strMessage = "VICaR Connection: Connection set up.";
+
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
}
if (!QDBusConnection::sessionBus().registerService(serviceName()))
{
strMessage = "VICaR Connection: Problem registering connection service:" + serviceName();
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
return false;
}
this))
{
strMessage = "VICaR Connection: Problem registering object path:" + objectPath().path();
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
return false;
}
}
else{
strMessage = "VICaR Connection: " + serviceName()+" is already registered on DBus";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
}
return true;
void Connection::unregisterObject()
{
QString strMessage = "VICaR Connection: Unregistering Connection object from DBus";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
QDBusConnection::sessionBus().unregisterObject(objectPath().path());
QDBusConnection::sessionBus().unregisterService(serviceName());
I am not connecting to anything.
*/
QString strMessage = "VICaR Connection: Changing status to Connected...";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
d->connection_status = Connection::Connected;
//Let all the Telepathy clients know that connection status has changed
strMessage = "VICaR Connection: Emitting StatusChanged.";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
emit StatusChanged(d->connection_status, ReasonRequested);
}
void Connection::Disconnect()
{
QString strMessage = "VICaR Connection: Changing status to Disconnected...";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
//We don't have any Handles to release here. So just change the status to Disconnected
d->connection_status = Connection::Disconnected;
strMessage = "VICaR Connection: Emitting StatusChanged";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
emit StatusChanged(d->connection_status, ReasonRequested);
uint Connection::GetSelfHandle()
{
QString strMessage = "VICaR Connection: GetSelfHandle";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
if (d->connection_status != Connected)
{
sendErrorReply("org.freedesktop.Telepathy.Error.Disconnected",
"VICaR - Unable to get Self Handle. The connection is no longer available.");
strMessage = "VICaR Connection: NOT CONNECTED when requesting selfhandle!";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
return 0;
}
//WARNING: Incomplete implemenation
+<<<<<<< HEAD
uint handle(SELF_HANDLE);
strMessage = "VICaR Connection: Returning Handle " + QString::number(handle) + "as self handle.";
+=======
+ uint handle = 0;
+ strMessage = "VICaR Connection: Returning Handle " + QString(handle) + "as self handle.";
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
return handle;
}
{
Q_UNUSED(handles);
QString strMessage = "VICaR Connection: HoldHandles.";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
if (d->connection_status != Connected)
{
strMessage = "VICaR Connection: HoldHandles - Not Connected.";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
sendErrorReply("org.freedesktop.Telepathy.Error.Disconnected",
{
strMessage = "VICaR Connection: HoldHandles - Invalid Handle Type.";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
sendErrorReply("org.freedesktop.Telepathy.Error.InvalidArgument",
{
Q_UNUSED(handles);
QStringList handlesList;
+<<<<<<< HEAD
+=======
+
+ QString strMessage = "VICaR Connection: InspectHandles.";
+ qDebug() << strMessage;
+ d->logUtility->logMessage(strMessage);
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
QString strMessage = "VICaR Connection: InspectHandles.";
//d->logUtility->logMessage(strMessage);
sendErrorReply("org.freedesktop.Telepathy.Error.InvalidArgument",
"VICaR - Supports handles of type Contact only.");
return handlesList;
+<<<<<<< HEAD
+=======
+ }
+
+ uint handle = 0;
+ for (int i = 0 ; i < handles.length(); i++) {
+ handle = handles.at(i);
+ strMessage = "VICaR Connection: Inspecting handle "+QString(handle);
+ qDebug() << strMessage;
+ d->logUtility->logMessage(strMessage);
+ handlesList.append(QString(handle));
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
}
uint handle;
void Connection::ReleaseHandles(const uint handle_type, const QList<uint> &handles)
{
Q_UNUSED(handles);
+<<<<<<< HEAD
QString strMessage = "VICaR Connection: ReleaseHandles.";
d->logUtility->logMessage(strMessage);
+=======
+ QString strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
if (d->connection_status != Connected)
{
sendErrorReply("org.freedesktop.Telepathy.Error.Disconnected",
"VICaR - Unable to release handle. The connection is no longer available.");
strMessage = "VICaR Connection: Releasing Handle while connection is no longer connected.";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
return;
}
sendErrorReply("org.freedesktop.Telepathy.Error.InvalidArgument",
"VICaR - Supports handles of type Contact only.");
strMessage = "VICaR Connection: Trying to release a Handle that is not a contact.";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
return;
}
Q_ASSERT(!request.isEmpty());
QString strMessage;
strMessage = "VICaR Connection: CreateChannel";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
qDebug() << " Request details are: "<< request;
Q_UNUSED(channel_properties);
Q_ASSERT(!request.isEmpty());
QString strMessage = "VICaR Connection: EnsureChannel";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
qDebug() << " Request details are: "<< request;
QDBusObjectPath Connection::processChannel(const QVariantMap &request){
QString strMessage = "VICaR Connection: ProcessChannel";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
QDBusObjectPath channel_path;
strMessage = "VICaR Connection: Call is processed.";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
return channel_path;
QString strMessage;
strMessage = "VICaR Connection: AddClientInterest";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
}
QString strMessage;
strMessage = "VICaR Connection: RemoveClientInterest";
+<<<<<<< HEAD
+=======
+ qDebug() << strMessage;
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
d->logUtility->logMessage(strMessage);
}