summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-25 00:13:33 (UTC)
committer harlekin <harlekin>2003-03-25 00:13:33 (UTC)
commita70a56b2ec4a806e00a26c8768b9f3df7033e987 (patch) (side-by-side diff)
treec0b811851694f4253c4cf323369f8034792ecf71
parentc80099645138ab1ab8ad542cbfce401bcc6d095c (diff)
downloadopie-a70a56b2ec4a806e00a26c8768b9f3df7033e987.zip
opie-a70a56b2ec4a806e00a26c8768b9f3df7033e987.tar.gz
opie-a70a56b2ec4a806e00a26c8768b9f3df7033e987.tar.bz2
give me other popups then obex again .-|
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp2
-rw-r--r--noncore/net/opietooth/manager/panpopup.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 04fa117..935c11a 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -324,25 +324,25 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
* If escaped( -1 ) or any of our items were chosen we'll
* delete the PopupMenu otherwise it's the responsibility of
* the PopupMenu to delete itself
*
*/
else if ( ((BTListItem*)item)->type() == "service") {
BTServiceItem* service = (BTServiceItem*)item;
QMap<int, QString> list = service->services().classIdList();
QMap<int, QString>::Iterator it = list.begin();
QPopupMenu *popup =0l;
if ( it != list.end() ) {
qWarning("Searching id %d %s", it.key(), it.data().latin1() );
- popup = m_popHelper.find( 4358,
+ popup = m_popHelper.find( it.key(),
service->services(),
(BTDeviceItem*)service->parent() );
}else {
qWarning("Empty");
}
if ( popup == 0l ) {
qWarning("factory returned 0l");
popup = new QPopupMenu();
}
int test1 = popup->insertItem( tr("Test1:"), 2);
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp
index 61e632b..7a0ee55 100644
--- a/noncore/net/opietooth/manager/panpopup.cpp
+++ b/noncore/net/opietooth/manager/panpopup.cpp
@@ -34,24 +34,25 @@ PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() {
c = new QAction();
c->setText( tr( "disconnect" ) );
c->addTo( this );
connect( c, SIGNAL( activated() ), this, SLOT( slotDisconnect() ) );
};
PanPopup::~PanPopup() {
}
void PanPopup::slotConnect() {
+
m_panconnection = new StartPanConnection( m_item->mac() );
m_panconnection->start();
}
void PanPopup::slotDisconnect() {
m_panconnection->stop();
}
void PanPopup::slotConnectAndConfig() {
slotConnect();