Removes unused import and improves code on previous commit that adds configuration property allowing to disable searches in call history

src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java

@@ -11,7 +11,6 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.contactsource.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.event.*;
@@ -45,6 +44,14 @@ public class SearchFilter
      */
     protected ContactList sourceContactList;
 
+    /**
+     * The name of the property indicating if searches in call history are
+     * enabled.
+     */
+    protected String DISABLE_CALL_HISTORY_SEARCH_PROP
+        = "net.java.sip.communicator.impl.gui"
+                + ".DISABLE_CALL_HISTORY_SEARCH_IN_CONTACT_LIST";
+
     /**
      * Creates an instance of <tt>SearchFilter</tt>.
      */
@@ -104,9 +111,10 @@ else if (sourceContactList.getDefaultFilter()
 
             // Don't search in history sources if this is disabled from the
             // corresponding configuration property.
-            if (GuiActivator.getConfigurationService().getBoolean(
-                    "net.java.sip.communicator.impl.gui"
-                    + ".DISABLE_CALL_HISTORY_SEARCH_IN_CONTACT_LIST", false)
+            if (sourceContactList.getDefaultFilter()
+                    .equals(TreeContactList.presenceFilter)
+                && GuiActivator.getConfigurationService().getBoolean(
+                    DISABLE_CALL_HISTORY_SEARCH_PROP, true)
                 && filterSource.getContactSourceService().getType()
                     == ContactSourceService.HISTORY_TYPE)
                 continue;