diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2012-09-18 13:35:20 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2012-09-18 13:35:20 +0000 |
| commit | a10c9ce805c7e4b9f3851d00d7348913d2fcae2f (patch) | |
| tree | 540ea52faf27200fe8f3f334674617a2c86fead8 /src/net | |
| parent | d79dcf7ec44ee87d3fbb5fcd7ce111482fb35234 (diff) | |
| download | jitsi-a10c9ce805c7e4b9f3851d00d7348913d2fcae2f.zip jitsi-a10c9ce805c7e4b9f3851d00d7348913d2fcae2f.tar.gz jitsi-a10c9ce805c7e4b9f3851d00d7348913d2fcae2f.tar.bz2 | |
Don't show history search results before other contact sources. Fixes the appearing of the "Unknown contact view" when there are actual results available for the performed search.
Diffstat (limited to 'src/net')
3 files changed, 3 insertions, 6 deletions
diff --git a/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java b/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java index db504f9..f78ec65 100644 --- a/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java +++ b/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java @@ -291,6 +291,6 @@ public class CallHistoryContactSource */ public int getIndex() { - return 0; + return -1; } } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java index 9e08ec7..d0a0499 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java @@ -213,11 +213,7 @@ public class SearchField */ public void filterQueryFailed(FilterQuery query) { - /// If don't have matching contacts we enter the unknown contact - // view. - enableUnknownContactView(true); - - query.setQueryListener(null); + closeFilterQuery(query, !contactList.isEmpty()); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java index 2287618..05419bb 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java @@ -114,6 +114,7 @@ public class SearchFilter // Closes this filter to indicate that we finished adding queries to it. if (filterQuery.isRunning()) filterQuery.close(); + else if (!sourceContactList.isEmpty()) sourceContactList.selectFirstContact(); } |