aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip
diff options
context:
space:
mode:
authorYana Stamcheva <yana@jitsi.org>2008-05-01 16:39:02 +0000
committerYana Stamcheva <yana@jitsi.org>2008-05-01 16:39:02 +0000
commit0b30ce7743fdeb6b997967b05b074e0894253f3d (patch)
tree561ba6c220058e3db3f487291f6fcf299a08ead5 /src/net/java/sip
parent0e9ae22e0a57a057d33cc447118cc10e0e869633 (diff)
downloadjitsi-0b30ce7743fdeb6b997967b05b074e0894253f3d.zip
jitsi-0b30ce7743fdeb6b997967b05b074e0894253f3d.tar.gz
jitsi-0b30ce7743fdeb6b997967b05b074e0894253f3d.tar.bz2
check if the plugincomponent is null.
Diffstat (limited to 'src/net/java/sip')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
index bddfa4f..738f053 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
@@ -391,6 +391,9 @@ public class ContactRightButtonMenu
PluginComponent component = (PluginComponent) GuiActivator
.bundleContext.getService(serRefs[i]);;
+ if (component.getComponent() == null)
+ return;
+
component.setCurrentContact(contactItem);
this.add((Component)component.getComponent());
@@ -854,7 +857,13 @@ public class ContactRightButtonMenu
= UIServiceImpl.getBorderLayoutConstraintsFromContainer(
c.getConstraints());
- this.add((Component) c.getComponent(), constraints);
+ if (c.getComponent() == null)
+ return;
+
+ if (constraints == null)
+ this.add((Component) c.getComponent());
+ else
+ this.add((Component) c.getComponent(), constraints);
c.setCurrentContact(contactItem);