diff options
| author | Timothy Pearson <[email protected]> | 2013-05-19 14:51:39 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-05-19 14:51:39 -0500 |
| commit | 3a3d187585f05730e7084ae122d80438bde88080 (patch) | |
| tree | ee9f471fc9ece1f7238e0b6973211e91f2250eeb /konqueror/sidebar/trees/konq_sidebartree.cpp | |
| parent | 533941e5ddcf5c54f2da68c743da4dea6678c352 (diff) | |
| download | tdebase-3a3d187585f05730e7084ae122d80438bde88080.tar.gz tdebase-3a3d187585f05730e7084ae122d80438bde88080.zip | |
Fix inadvertent sidebar signal disconnection on mouse settings reload
This resolves Bug 1515
Diffstat (limited to 'konqueror/sidebar/trees/konq_sidebartree.cpp')
| -rw-r--r-- | konqueror/sidebar/trees/konq_sidebartree.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 1e8f4d791..cd915c4ab 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -156,7 +156,7 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); connect( this, TQT_SIGNAL( selectionChanged() ), @@ -475,8 +475,9 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item ) args.serviceType = dItem->externalMimeType(); args.trustedSource = true; KURL externalURL = dItem->externalURL(); - if ( !externalURL.isEmpty() ) + if ( !externalURL.isEmpty() ) { openURLRequest( externalURL, args ); + } } void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col ) @@ -492,7 +493,10 @@ void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item } } -void KonqSidebarTree::slotMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col) +// This is named slotSidebarMouseButtonClicked() so as not to conflict with slotMouseButtonClicked() +// If the same name is used, both slots will be disconnected whenever mouse settings are loaded +// See tdelistview.cpp slotSettingsChanged() and Bug 1515 for details +void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem* _item, const TQPoint&, int col) { KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>(_item); if(_item && col < 2) |