reolved merge conflict

1 files changed, 2 insertions, 0 deletions

diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 3428798..ef0e482 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -59,33 +59,35 @@ bool DocLnkSearch::searchFile( AppLnk *app )
 #ifdef NEW_OWAIT
             QString ouput = QObject::tr("searching %1").arg(doc->file());
 		OWait( output );
 #endif
 	  	QFile f(doc->file());
   		if ( f.open(IO_ReadOnly) ) {
        			QTextStream t( &f );
         		while ( !t.eof() )
        	    			if (_search.match( t.readLine()) != -1) {
 					found = true;
 					break;
 				}
  	       	}
   		f.close();
     	}
 	return found;
 }
 
 void DocLnkSearch::insertItem( void *rec )
 {
 	(void)new DocLnkItem( this, (DocLnk*)rec );
 	_resultCount++;
 }
 
 
 QPopupMenu* DocLnkSearch::popupMenu()
 {
 	if (!_popupMenu){
 		_popupMenu = new QPopupMenu( 0 );
  		actionSearchInFiles->addTo( _popupMenu );
 	}
 	return _popupMenu;
+	(void) new DocLnkItem( this, (DocLnk*)rec );
+	_resultCount++;
 }