mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

Merge branch 'stable' of github.com:tomahawk-player/tomahawk into stable

Browse Source
This commit is contained in:
Jeff Mitchell
2011-03-27 13:57:13 -04:00
parent 719255e4c9 6bde5655cd
commit 474b9bc604
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/sip/jabber/jabber_p.cpp
View File

@@ -614,8 +614,7 @@ Jabber_p::handleSubscriptionRequest( const JID& jid, const std::string& /*msg*/
// check if the requester is already on the roster // check if the requester is already on the roster
RosterItem *item = m_client->rosterManager()->getRosterItem(jid); RosterItem *item = m_client->rosterManager()->getRosterItem(jid);
if(item) qDebug() << "subscription status:" << static_cast<int>( item->subscription() ); if(item) qDebug() << Q_FUNC_INFO << jid.bare().c_str() << "subscription status:" << static_cast<int>( item->subscription() );
if(item && if(item &&
( (
item->subscription() == gloox::S10nNoneOut || // Contact and user are not subscribed to each other, and user has sent contact a subscription request but contact has not replied yet. item->subscription() == gloox::S10nNoneOut || // Contact and user are not subscribed to each other, and user has sent contact a subscription request but contact has not replied yet.
@@ -624,34 +623,32 @@ Jabber_p::handleSubscriptionRequest( const JID& jid, const std::string& /*msg*/
) )
) )
{ {
qDebug() << Q_FUNC_INFO << jid.bare().c_str() << "Already on the roster so we assume ack'ing subscription request is okay..."; qDebug() << Q_FUNC_INFO << jid.bare().c_str() << "already on the roster so we assume ack'ing subscription request is okay...";
// ack the request
m_client->rosterManager()->ackSubscriptionRequest( jid, true ); m_client->rosterManager()->ackSubscriptionRequest( jid, true );
// return anything, the result is ignored
return false; return false;
} }
if( !m_subscriptionConfirmBoxes.value(jid).isNull() ) // we don't have to check for an already open check box because gloox doesnt call this method until a former request was ack'ed
{ qDebug() << Q_FUNC_INFO << jid.bare().c_str() << "open subscription request box";
qDebug() << Q_FUNC_INFO << jid.bare().c_str() << " confirmBox already open" ;
// the user decides with the already open box, so we can return false here
m_client->rosterManager()->ackSubscriptionRequest( jid, false );
return false;
}
// preparing the confirm box for the user // preparing the confirm box for the user
QWeakPointer<QMessageBox> confirmBox = QWeakPointer<QMessageBox>( new QMessageBox( QMessageBox *confirmBox = new QMessageBox(
QMessageBox::Question, QMessageBox::Question,
tr("Friend Request in Jabber"), tr("Friend Request in Jabber"),
QString(tr("Do you want to be friends with <b>%1</b>?")).arg(QLatin1String(jid.bare().c_str())), QString(tr("Do you want to be friends with <b>%1</b>?")).arg(QLatin1String(jid.bare().c_str())),
QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok | QMessageBox::Cancel,
0) ); 0
);
// add confirmBox to m_subscriptionConfirmBoxes // add confirmBox to m_subscriptionConfirmBoxes
m_subscriptionConfirmBoxes.insert( jid, confirmBox ); m_subscriptionConfirmBoxes.insert( jid, confirmBox );
// display the box and wait for the answer // display the box and wait for the answer
confirmBox.data()->open( this, SLOT( onSubscriptionRequestConfirmed( int ) ) ); confirmBox->open( this, SLOT( onSubscriptionRequestConfirmed( int ) ) );
return false; return false;
} }
@@ -659,19 +656,22 @@ Jabber_p::handleSubscriptionRequest( const JID& jid, const std::string& /*msg*/
void void
Jabber_p::onSubscriptionRequestConfirmed(int result) Jabber_p::onSubscriptionRequestConfirmed(int result)
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO << result;
QList< QWeakPointer<QMessageBox> > confirmBoxes = m_subscriptionConfirmBoxes.values(); QList< QMessageBox* > confirmBoxes = m_subscriptionConfirmBoxes.values();
JID jid; JID jid;
foreach(QWeakPointer<QMessageBox> currentBox, confirmBoxes) foreach(QMessageBox* currentBox, confirmBoxes)
{ {
if( !currentBox.isNull() && currentBox.data() == sender() ) if( currentBox == sender() )
{ {
jid = m_subscriptionConfirmBoxes.key( currentBox ); jid = m_subscriptionConfirmBoxes.key( currentBox );
} }
} }
qDebug() << Q_FUNC_INFO << "box confirmed for" << jid.bare().c_str();
// we got an answer, deleting the box // we got an answer, deleting the box
m_subscriptionConfirmBoxes.remove( jid );
sender()->deleteLater(); sender()->deleteLater();
QMessageBox::StandardButton allowSubscription = static_cast<QMessageBox::StandardButton>( result ); QMessageBox::StandardButton allowSubscription = static_cast<QMessageBox::StandardButton>( result );
@@ -683,13 +683,16 @@ Jabber_p::onSubscriptionRequestConfirmed(int result)
groups.push_back( "Tomahawk" ); groups.push_back( "Tomahawk" );
m_client->rosterManager()->subscribe( jid, "", groups, "" ); m_client->rosterManager()->subscribe( jid, "", groups, "" );
// ack the request
m_client->rosterManager()->ackSubscriptionRequest( jid, true ); m_client->rosterManager()->ackSubscriptionRequest( jid, true );
return;
} }
else
{
qDebug() << Q_FUNC_INFO << jid.bare().c_str() << "declined by user";
qDebug() << Q_FUNC_INFO << jid.bare().c_str() << "declined by user"; // decl the request
m_client->rosterManager()->ackSubscriptionRequest( jid, false ); m_client->rosterManager()->ackSubscriptionRequest( jid, false );
return; }
} }
bool bool

2
src/sip/jabber/jabber_p.h
View File

@@ -166,7 +166,7 @@ private:
QSharedPointer<gloox::VCardManager> m_vcardManager; QSharedPointer<gloox::VCardManager> m_vcardManager;
QString m_server; QString m_server;
QScopedPointer<QSocketNotifier> m_notifier; QScopedPointer<QSocketNotifier> m_notifier;
QHash<gloox::JID, QWeakPointer<QMessageBox> > m_subscriptionConfirmBoxes; QHash<gloox::JID, QMessageBox*> m_subscriptionConfirmBoxes;
}; };
#endif // JABBER_H #endif // JABBER_H