aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/java/sip/communicator')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java34
-rw-r--r--src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java12
-rw-r--r--src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java32
3 files changed, 56 insertions, 22 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
index b4806b2..c694107 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
@@ -162,7 +162,7 @@ public abstract class BasicConferenceParticipantPanel<T>
* is to depict a specific conference participant.
*
* @param callRenderer the renderer for the call
- * @param isLocalPeer if the peer is the local ones
+ * @param participant participant
* @param isVideo indicates if we're in a video interface
*/
public BasicConferenceParticipantPanel(
@@ -252,8 +252,8 @@ public abstract class BasicConferenceParticipantPanel<T>
}
/**
- * Sets the name of the participant.
- * @param participantName the name of the participant
+ * Gets the name of the participant.
+ * @return returns the name of the participant
*/
public String getParticipantName()
{
@@ -510,8 +510,20 @@ public abstract class BasicConferenceParticipantPanel<T>
* display this reason to the user.
* @param reason the reason to display
*/
- protected void setErrorReason(String reason)
+ protected void setErrorReason(final String reason)
{
+ if(!SwingUtilities.isEventDispatchThread())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ setErrorReason(reason);
+ }
+ });
+ return;
+ }
+
if (errorMessageComponent == null)
{
errorMessageComponent = new JTextPane();
@@ -568,8 +580,20 @@ public abstract class BasicConferenceParticipantPanel<T>
* Sets the state of the participant.
* @param participantState the state of the participant
*/
- public void setParticipantState(String participantState)
+ public void setParticipantState(final String participantState)
{
+ if(!SwingUtilities.isEventDispatchThread())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ setParticipantState(participantState);
+ }
+ });
+ return;
+ }
+
callStatusLabel.setText(participantState.toLowerCase());
}
diff --git a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
index f29cdcb..d521310 100644
--- a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
@@ -323,10 +323,20 @@ public class DeviceConfigurationComboBoxModel
{
for (CaptureDevice device : getDevices())
{
- if (device.info.equals(info))
+ if (info.equals(device.info))
return device;
}
}
+ else
+ {
+ // just find the one with no info, the None device
+ for (CaptureDevice device : getDevices())
+ {
+ if (device.info == null)
+ return device;
+ }
+ }
+
return null;
}
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java b/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java
index 89a4649..6c1cd4f 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/InfoRetreiver.java
@@ -195,50 +195,50 @@ public class InfoRetreiver
if (snac instanceof MetaBasicInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received basic info");
+ if (logger.isTraceEnabled())
+ logger.trace("received basic info");
readBasicUserInfo((MetaBasicInfoCmd)snac);
}
else if (snac instanceof MetaMoreInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received meta more info");
+ if (logger.isTraceEnabled())
+ logger.trace("received meta more info");
readMoreUserInfo((MetaMoreInfoCmd)snac);
}
else if (snac instanceof MetaEmailInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received email info");
+ if (logger.isTraceEnabled())
+ logger.trace("received email info");
readEmailUserInfo((MetaEmailInfoCmd)snac);
}
else if (snac instanceof MetaHomepageCategoryInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received home page info");
+ if (logger.isTraceEnabled())
+ logger.trace("received home page info");
readHomePageUserInfo((MetaHomepageCategoryInfoCmd)snac);
}
else if (snac instanceof MetaWorkInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received work info");
+ if (logger.isTraceEnabled())
+ logger.trace("received work info");
readWorkUserInfo((MetaWorkInfoCmd)snac);
}
else if (snac instanceof MetaNotesInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received notes info");
+ if (logger.isTraceEnabled())
+ logger.trace("received notes info");
readUserAboutInfo((MetaNotesInfoCmd)snac);
}
else if (snac instanceof MetaInterestsInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received interest info");
+ if (logger.isTraceEnabled())
+ logger.trace("received interest info");
readInterestsUserInfo((MetaInterestsInfoCmd)snac);
}
else if (snac instanceof MetaAffiliationsInfoCmd)
{
- if (logger.isInfoEnabled())
- logger.info("received affiliations info");
+ if (logger.isTraceEnabled())
+ logger.trace("received affiliations info");
readAffilationsUserInfo((MetaAffiliationsInfoCmd)snac);
result =