aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2015-08-23 14:25:09 +0200
committerIngo Bauersachs <ingo@jitsi.org>2015-08-23 15:03:50 +0200
commit3c4c8d525449fdcaa6a8fdd5d95fb41524c7e653 (patch)
treec6670665928d293ef95994f4fdd379b93c63e7d2 /src/net/java/sip/communicator/impl
parent662fcc824c0aed2bc459aa26ea62d0c06bed3022 (diff)
downloadjitsi-3c4c8d525449fdcaa6a8fdd5d95fb41524c7e653.zip
jitsi-3c4c8d525449fdcaa6a8fdd5d95fb41524c7e653.tar.gz
jitsi-3c4c8d525449fdcaa6a8fdd5d95fb41524c7e653.tar.bz2
Move security events back from libjitsi as they are solely used here.
Corresponds to commit jitsi/libjitsi@263cc1e53e4d2ebd3f4762c42b2c27462b4d830c
Diffstat (limited to 'src/net/java/sip/communicator/impl')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java1
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java1
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java1
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java2
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java1
-rw-r--r--src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf1
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java1
7 files changed, 0 insertions, 8 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
index aa25719..4f04fdb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
@@ -40,7 +40,6 @@ import net.java.sip.communicator.util.call.CallPeerAdapter;
import net.java.sip.communicator.util.skin.*;
import org.jitsi.service.neomedia.*;
-import org.jitsi.service.protocol.event.*;
import org.jitsi.util.swing.*;
/**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
index ce45ded..18a0c5a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
@@ -35,7 +35,6 @@ import net.java.sip.communicator.service.resources.*;
import org.jitsi.service.configuration.*;
import org.jitsi.service.neomedia.*;
-import org.jitsi.service.protocol.event.*;
import org.jitsi.service.resources.*;
import org.jitsi.util.event.*;
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 6212435..c088a79 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
@@ -30,7 +30,6 @@ import net.java.sip.communicator.service.resources.*;
import net.java.sip.communicator.util.skin.*;
import org.jitsi.service.neomedia.*;
-import org.jitsi.service.protocol.event.*;
/**
* The basic panel used to render any conference participant. Meant to be
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
index 27eb09c..e408498 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
@@ -28,8 +28,6 @@ import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.skin.*;
-import org.jitsi.service.protocol.event.*;
-
/**
* Depicts a specific <tt>CallPeer</tt> who is a focus of a telephony conference
* and the <tt>ConferenceMember</tt>s whom the specified <tt>CallPeer</tt> is
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
index f29cd05..b49bb75 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
@@ -36,7 +36,6 @@ import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.call.CallPeerAdapter;
import org.jitsi.service.neomedia.*;
-import org.jitsi.service.protocol.event.*;
import org.jitsi.service.resources.*;
/**
diff --git a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
index 4b983b0..2d1522d 100644
--- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
+++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
@@ -73,7 +73,6 @@ Import-Package: com.apple.eawt,
org.jitsi.service.neomedia.format,
org.jitsi.service.neomedia.recording,
org.jitsi.service.protocol,
- org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.jitsi.util,
org.jitsi.util.event,
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
index 5dab563..64eb5fa 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
@@ -25,7 +25,6 @@ import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.ContentPacketExtension.SendersEnum;
import net.java.sip.communicator.impl.protocol.jabber.jinglesdp.*;
import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.media.*;
import net.java.sip.communicator.util.*;
import org.jitsi.service.neomedia.*;