aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYana Stamcheva <yana@jitsi.org>2010-05-07 08:46:24 +0000
committerYana Stamcheva <yana@jitsi.org>2010-05-07 08:46:24 +0000
commit71100a6e1b67f11acc40fb65dec7bad6b9b61ef1 (patch)
treef8057a0a496ded7af69fcfe0d707fbb1cee336c1
parent064e280fb6d56de57aad7c5509c7860e79f67183 (diff)
downloadjitsi-71100a6e1b67f11acc40fb65dec7bad6b9b61ef1.zip
jitsi-71100a6e1b67f11acc40fb65dec7bad6b9b61ef1.tar.gz
jitsi-71100a6e1b67f11acc40fb65dec7bad6b9b61ef1.tar.bz2
Fix appearing "add contact" and "call contact" buttons before the search is completed.
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/contactlist/FilterQuery.java3
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/FilterQuery.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/FilterQuery.java
index 563710c..3376043 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/FilterQuery.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/FilterQuery.java
@@ -125,7 +125,8 @@ public class FilterQuery
return;
// First set the isSucceeded property.
- setSucceeded(!isSucceeded() && !query.getQueryResults().isEmpty());
+ if (!isSucceeded() && !query.getQueryResults().isEmpty())
+ setSucceeded(true);
// Then remove the wait result from the filterQuery.
filterQueries.remove(query);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
index 7d6f591..22d1633 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
@@ -1075,8 +1075,8 @@ public class TreeContactList
tempTreeModel,
filterSource);
- filterQuery.setSucceeded(
- !filterQuery.isSucceeded() && isSucceeded);
+ if (!filterQuery.isSucceeded() && isSucceeded)
+ filterQuery.setSucceeded(true);
}
}.start();
}