summaryrefslogtreecommitdiffstats
path: root/src/menuhandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/menuhandler.cpp')
-rw-r--r--src/menuhandler.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/src/menuhandler.cpp b/src/menuhandler.cpp
index db280fb..33c1477 100644
--- a/src/menuhandler.cpp
+++ b/src/menuhandler.cpp
@@ -448,7 +448,6 @@ void MenuHandler::readConfig()
int h = (int)(r.height()/_menuHeight);
resize(w,h);
- _kerryIntegration = prefSkel->kerryIntegration();
_strigiIntegration = prefSkel->strigiIntegration();
_isNormalWindow = prefSkel->isNormalWindow();
@@ -464,36 +463,20 @@ void MenuHandler::readConfig()
}
// disconnect(menu->searchLine, 0, 0, 0);
- if( !_kerryIntegration && !_strigiIntegration )
+ if( !_strigiIntegration )
{
//menu->searchLine->setListView((TDEListView *)(menu->dynamicList));
disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
- this, SLOT (kerrySearch( const TQString &)) );
- disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
this, SLOT (strigiSearch( const TQString &)) );
connect(menu->searchLine, SIGNAL(textChanged( const TQString &)),
this, SLOT (initializeSearch( const TQString &)) );
}
- else if( _kerryIntegration )
- {
- menu->searchLine->setListView(NULL);
- menu->searchLine->setEnabled(true);
- disconnect(menu->searchLine, SIGNAL(textChanged( const TQString &)),
- this, SLOT (initializeSearch( const TQString &)) );
- disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
- this, SLOT (strigiSearch( const TQString &)) );
- connect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
- this, SLOT (kerrySearch( const TQString &)) );
- menu->searchLine->setContextMenuEnabled(false);
- }
else //strigi
{
menu->searchLine->setListView(NULL);
menu->searchLine->setEnabled(true);
disconnect(menu->searchLine, SIGNAL(textChanged( const TQString &)),
this, SLOT (initializeSearch( const TQString &)) );
- disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
- this, SLOT (kerrySearch( const TQString &)) );
connect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
this, SLOT (strigiSearch( const TQString &)) );
menu->searchLine->setContextMenuEnabled(false);
@@ -1620,13 +1603,6 @@ void MenuHandler::initializeSearch( const TQString & query )
}
}
-void MenuHandler::kerrySearch( const TQString & query )
-{
- close();
- DCOPRef kdesktopKScreensaverIface ("kerry", "search");
- kdesktopKScreensaverIface.call ("search(TQString)", query);
-}
-
void MenuHandler::strigiSearch( const TQString & query )
{
close();