summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index b31e14f..d3abb54 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -284,45 +284,37 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
284 284
285 if ( ((BTListItem*)item)->type() == "device") { 285 if ( ((BTListItem*)item)->type() == "device") {
286 286
287 QPopupMenu *groups = new QPopupMenu(); 287 QPopupMenu *groups = new QPopupMenu();
288 288
289 menu->insertItem( ((BTDeviceItem*)item)->name(),0 ); 289 menu->insertItem( ((BTDeviceItem*)item)->name(),0 );
290 menu->insertSeparator(1); 290 menu->insertSeparator(1);
291 menu->insertItem( tr("rescan sevices"), 2); 291 menu->insertItem( tr("rescan sevices"), 2);
292 menu->insertItem( tr("to group"), groups , 3); 292 menu->insertItem( tr("to group"), groups , 3);
293 menu->insertItem( tr("delete"), 4); 293 menu->insertItem( tr("delete"), 4);
294 294
295 ret = menu->exec( point , 0); 295 ret = menu->exec( point , 0);
296 296
297 switch(ret) { 297 switch(ret) {
298 case -1: 298 case -1:
299 break; 299 break;
300 case 0: 300 case 2:
301 addServicesToDevice( (BTDeviceItem*)item ); 301 addServicesToDevice( (BTDeviceItem*)item );
302 break; 302 break;
303 case 1:
304 303
305 break; 304 case 4:
306
307 // NO need to, since hcid does that on the fly
308 // case 2:
309 // make connection
310 //m_localDevice->connectTo( ((BTDeviceItem*)item)->mac() );
311 //break;
312 case 3:
313 // deletes childs too 305 // deletes childs too
314 delete item; 306 delete item;
315 break; 307 break;
316 } 308 }
317 delete groups; 309 delete groups;
318 310
319 } 311 }
320 312
321 /* 313 /*
322 * We got service sensitive PopupMenus in our factory 314 * We got service sensitive PopupMenus in our factory
323 * We will create one through the factory and will insert 315 * We will create one through the factory and will insert
324 * our Separator + ShowInfo into the menu or create a new 316 * our Separator + ShowInfo into the menu or create a new
325 * one if the factory returns 0 317 * one if the factory returns 0
326 * PopupMenu deletion is kind of weird. 318 * PopupMenu deletion is kind of weird.
327 * If escaped( -1 ) or any of our items were chosen we'll 319 * If escaped( -1 ) or any of our items were chosen we'll
328 * delete the PopupMenu otherwise it's the responsibility of 320 * delete the PopupMenu otherwise it's the responsibility of