aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/java/sip')
-rw-r--r--src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/gui/UIServiceImpl.java21
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/CallManager.java71
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java48
-rw-r--r--src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/hid/hid.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/history/history.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/notification/notification.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf2
-rwxr-xr-xsrc/net/java/sip/communicator/impl/version/version.impl.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf2
-rwxr-xr-xsrc/net/java/sip/communicator/plugin/branding/branding.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf2
-rwxr-xr-xsrc/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf2
-rwxr-xr-xsrc/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java464
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/MessengerContact.java60
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java75
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/OutOfProcessServer.java27
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf11
-rw-r--r--src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/otr/otr.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/contactlist/MetaContactListService.java18
-rwxr-xr-xsrc/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/gui/UIService.java5
-rw-r--r--src/net/java/sip/communicator/service/gui/gui.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/httputil/httputil.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/ldap/ldap.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/notification/notification.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/protocol/PresenceStatus.java2
-rw-r--r--src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/service/replacement/replacement.manifest.mf2
-rwxr-xr-xsrc/net/java/sip/communicator/service/version/version.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/util/dns/util.dns.manifest.mf2
-rw-r--r--src/net/java/sip/communicator/util/util.manifest.mf2
130 files changed, 896 insertions, 144 deletions
diff --git a/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf b/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
index 2ad388b..31e3155 100644
--- a/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
+++ b/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.argdelegation.ArgDelegationActivator
Bundle-Name: Argument Delegation
Bundle-Description: A bundle that delegates invocation arguments to register handler services
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf b/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
index 2739c07..55a9449 100644
--- a/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
+++ b/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.browserlauncher.BrowserLauncherActivator
Bundle-Name: Browser Launcher
Bundle-Description: An implementation of the BrowserLauncher service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.browserlauncher
diff --git a/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf b/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
index 44a6baf..6aab866 100644
--- a/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.callhistory.CallHistoryActivator
Bundle-Name: Call History Service Provider
Bundle-Description: A bundle that implements the call history package.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf b/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
index 7e3f074..8699c8d 100644
--- a/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
+++ b/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.certificate.CertificateVerificationActivator
Bundle-Name: Certificate Verification Activator
Bundle-Description: A bundle that offers certificate verification
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.certificate
diff --git a/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf b/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
index 9d2abfb..542af3d 100644
--- a/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
+++ b/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.configuration.ConfigurationActivator
Bundle-Name: Configuration Service Implementation
Bundle-Description: A bundle that offers configuration utilities
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
index 7b028d9..5d655e4 100644
--- a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.contactlist.ContactlistActivator
Bundle-Name: MetaContactList
Bundle-Description: An implementation of the MetaContactList service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf b/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
index 4b94a7d..9d7cb69 100644
--- a/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
+++ b/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.credentialsstorage.CredentialsStorageActivator
Bundle-Name: Credentials Storage Service Implementation
Bundle-Description: A bundle that handles credentials
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
index 5021ea4..df19ee5 100644
--- a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
+++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.fileaccess.FileAccessActivator
Bundle-Name: File Access Service Provider
Bundle-Description: A bundle that implements the file access package.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf b/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
index 50d8e76..9932f18 100644
--- a/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.filehistory.FileHistoryActivator
Bundle-Name: File History Service Provider
Bundle-Description: A bundle that implements the file history package.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf b/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
index 3792419..e1fe3df 100644
--- a/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.galagonotification.GalagoNotificationActivator
Bundle-Name: Desktop Notifications Provider
Bundle-Description: A bundle which implements notifications according to the freedesktop.org Desktop Notifications spec.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: javax.imageio,
diff --git a/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf b/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
index e78282d..93aec4c 100644
--- a/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
+++ b/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.globalshortcut.GlobalShortcutActivator
Bundle-Name: Global shortcut
Bundle-Description: A bundle which implements global shortcut
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
index 61e62da..9629bf1 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
+++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.googlecontacts.GoogleContactsActivator
Bundle-Name: Google Contacts Service Implementation
Bundle-Description: A bundle that offers access to Google Contacts
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf b/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
index 95fc79a..27444f4 100644
--- a/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.growlnotification.GrowlNotificationActivator
Bundle-Name: Growl Notification Service Provider
Bundle-Description: A bundle which implements Growl notifications.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index e9bdb53..853ffb9 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -21,6 +21,7 @@ import net.java.sip.communicator.impl.gui.event.*;
import net.java.sip.communicator.impl.gui.lookandfeel.*;
import net.java.sip.communicator.impl.gui.main.*;
import net.java.sip.communicator.impl.gui.main.account.*;
+import net.java.sip.communicator.impl.gui.main.call.*;
import net.java.sip.communicator.impl.gui.main.chat.*;
import net.java.sip.communicator.impl.gui.main.chat.conference.*;
import net.java.sip.communicator.impl.gui.main.chat.history.*;
@@ -1472,4 +1473,24 @@ public class UIServiceImpl
{
return new NewAccountDialog();
}
+
+ public void createCall(String[] participants)
+ {
+ if (participants.length == 1)
+ {
+ CallManager.createCall(participants[0], null);
+ }
+ else
+ throw new IllegalArgumentException("participants");
+ }
+
+ public void startChat(String[] participants)
+ {
+ if (participants.length == 1)
+ {
+ getChatWindowManager().startChat(participants[0]);
+ }
+ else
+ throw new IllegalArgumentException("participants");
+ }
} \ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
index 8f0da9a..c9d9244 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
@@ -795,25 +795,66 @@ public class CallManager
}
else if (telephonyProviders.size() > 1)
{
- ChooseCallAccountPopupMenu chooseAccountDialog
- = new ChooseCallAccountPopupMenu(
- c,
- callString,
- telephonyProviders,
- l);
-
- chooseAccountDialog
- .setLocation(c.getLocation());
- chooseAccountDialog.showPopupMenu();
+ /*
+ * Allow plugins which do not have a (Jitsi) UI to create calls by
+ * automagically picking up a telephony provider.
+ */
+ if (c == null)
+ {
+ ProtocolProviderService preferredTelephonyProvider = null;
+
+ for (ProtocolProviderService telephonyProvider
+ : telephonyProviders)
+ {
+ try
+ {
+ OperationSetPresence presenceOpSet
+ = telephonyProvider.getOperationSet(
+ OperationSetPresence.class);
+
+ if ((presenceOpSet != null)
+ && (presenceOpSet.findContactByID(callString)
+ != null))
+ {
+ preferredTelephonyProvider = telephonyProvider;
+ break;
+ }
+ }
+ catch (Throwable t)
+ {
+ if (t instanceof ThreadDeath)
+ throw (ThreadDeath) t;
+ }
+ }
+ if (preferredTelephonyProvider == null)
+ preferredTelephonyProvider = telephonyProviders.get(0);
+
+ CallManager.createCall(preferredTelephonyProvider, callString);
+ if (l != null)
+ l.callInterfaceStarted();
+ }
+ else
+ {
+ ChooseCallAccountPopupMenu chooseAccountDialog
+ = new ChooseCallAccountPopupMenu(
+ c,
+ callString,
+ telephonyProviders,
+ l);
+
+ chooseAccountDialog.setLocation(c.getLocation());
+ chooseAccountDialog.showPopupMenu();
+ }
}
else
{
new ErrorDialog(
- null,
- GuiActivator.getResources().getI18NString("service.gui.WARNING"),
- GuiActivator.getResources().getI18NString(
- "service.gui.NO_ONLINE_TELEPHONY_ACCOUNT"))
- .showDialog();
+ null,
+ GuiActivator.getResources().getI18NString(
+ "service.gui.WARNING"),
+ GuiActivator.getResources().getI18NString(
+ "service.gui.NO_ONLINE_TELEPHONY_ACCOUNT"))
+ .showDialog();
}
}
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
index 854b685..7962e87 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
@@ -772,6 +772,54 @@ public class ChatWindowManager
metaContact, protocolContact, isSmsMessage));
}
+ public void startChat(String contactString)
+ {
+ List<ProtocolProviderService> imProviders
+ = GuiActivator.getRegisteredProviders(
+ OperationSetBasicInstantMessaging.class);
+
+ if (imProviders.size() < 1)
+ throw new IllegalStateException("imProviders");
+
+ Contact contact = null;
+ MetaContactListService metaContactListService
+ = GuiActivator.getContactListService();
+ MetaContact metaContact = null;
+ boolean startChat = false;
+
+ for (ProtocolProviderService imProvider : imProviders)
+ {
+ try
+ {
+ OperationSetPresence presenceOpSet
+ = imProvider.getOperationSet(OperationSetPresence.class);
+
+ if (presenceOpSet != null)
+ {
+ contact = presenceOpSet.findContactByID(contactString);
+ if (contact != null)
+ {
+ metaContact
+ = metaContactListService.findMetaContactByContact(
+ contact);
+ if (metaContact != null)
+ {
+ startChat = true;
+ break;
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ if (t instanceof ThreadDeath)
+ throw (ThreadDeath) t;
+ }
+ }
+ if (startChat)
+ startChat(metaContact, contact, false);
+ }
+
/**
* Removes the non read state of the currently selected chat session. This
* will result in removal of all icons representing the non read state (like
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 bf871c6..4b8512a 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
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.gui.GuiActivator
Bundle-Name: UI Service Provider Implementation
Bundle-Description: An implementation of the UI service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/hid/hid.manifest.mf b/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
index b55a5ce..504fb2d 100644
--- a/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
+++ b/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.hid.HIDActivator
Bundle-Name: HID Service Implementation
Bundle-Description: A bundle that offers Human Interaction features.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/history/history.manifest.mf b/src/net/java/sip/communicator/impl/history/history.manifest.mf
index f5f52fc..bc08a6d 100644
--- a/src/net/java/sip/communicator/impl/history/history.manifest.mf
+++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.history.HistoryActivator
Bundle-Name: History Service Provider
Bundle-Description: A bundle that implements the history package.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf b/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
index 0d89efd..278a3c9 100644
--- a/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
+++ b/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.keybindings.KeybindingsActivator
Bundle-Name: Keybindings
Bundle-Description: Provides management and persistence of keyboard shortcuts.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf b/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
index 183a67f..248ca89 100644
--- a/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.ldap.LdapActivator
Bundle-Name: LDAP service provider
Bundle-Description: A bundle that implements LDAP service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf b/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
index 9f4fcd6..0466886 100644
--- a/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.metahistory.MetaHistoryActivator
Bundle-Name: Meta History Service Provider
Bundle-Description: A bundle that implements the meta history package.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
index ffeac0a..e2733ee 100644
--- a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.msghistory.MessageHistoryActivator
Bundle-Name: Message History Service Provider
Bundle-Description: A bundle that implements the message history package.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
index b19a583..e197905 100644
--- a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
+++ b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.neomedia.NeomediaActivator
Bundle-Name: Neomedia Service Implementation
Bundle-Description: A bundle that offers Media capture and presentation capabilities.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.bouncycastle.crypto,
diff --git a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
index eb983c7..597d606 100644
--- a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
+++ b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.netaddr.NetaddrActivator
Bundle-Name: Network Address Management service
Bundle-Description: A bundle that provides local address selection and negotiation via ice4j.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/notification/notification.manifest.mf b/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
index 4ac8cb2..c3b7bf9 100644
--- a/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.notification.NotificationActivator
Bundle-Name: Notifications
Bundle-Description: An implementation of the Notification service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf b/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
index 11c0aa5..0b3a30f 100644
--- a/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
+++ b/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.osdependent.OsDependentActivator
Bundle-Name: OS dependent
Bundle-Description: OS dependent.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.systray,
diff --git a/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf b/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
index 7cdd3b7..c7800d3 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
+++ b/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.packetlogging.PacketLoggingActivator
Bundle-Name: Packet Logging service
Bundle-Description: A bundle that provides packet logging in pcap file format
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
index 6d31b7b..4d0dc97 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.dict.DictActivator
Bundle-Name: Dict Protocol Provider
Bundle-Description: A bundle providing support for the Dict protocol.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
index a705687..f026f4c 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.gibberish.GibberishActivator
Bundle-Name: Gibberish Protocol Provider
Bundle-Description: A bundle providing support for the Gibberish protocol.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
index 8fe197d..b5d3641 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.icq.IcqActivator
Bundle-Name: ICQ Protocol Provider Implementation
Bundle-Description: An ICQ/AIM implementation of the Protocol Provider Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
index fb96241..1970232 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.irc.IrcActivator
Bundle-Name: Irc Protocol Provider
Bundle-Description: A bundle providing support for the Irc protocol.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
index c02dfc5..8872df0 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.jabber.JabberActivator
Bundle-Name: Jabber Protocol Provider Implementation
Bundle-Description: An Jabber implementation of the Protocol Provider Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
index c7e72e2..99f3451 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: MockProvider
Bundle-Description: Mock provider service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: net.java.sip.communicator.service.contactlist,
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
index b7c7a2d..bc21688 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.msn.MsnActivator
Bundle-Name: Msn Protocol Provider Implementation
Bundle-Description: An Msn implementation of the Protocol Provider Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.apache.commons.logging,
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
index 4533ae0..6a018f0 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.rss.RssActivator
Bundle-Name: Rss Protocol Provider
Bundle-Description: A bundle providing support for the Rss protocol.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
index dc9ef72..6f586f4 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.sip.SipActivator
Bundle-Name: SIP Communicator SIP Protocol Provider
Bundle-Description: A bundle that implements the Protocol Provider package over SIP.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.apache.log4j,
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
index af73cee..682107a 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.ssh.SSHActivator
Bundle-Name: SSH Protocol Provider
Bundle-Description: A bundle providing support for the SSH protocol.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
index c24547c..d399757 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.yahoo.YahooActivator
Bundle-Name: Yahoo Protocol Provider Implementation
Bundle-Description: An Yahoo implementation of the Protocol Provider Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
index b3e9d21..ce58820 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.protocol.zeroconf.ZeroconfActivator
Bundle-Name: Zeroconf Protocol Provider
Bundle-Description: A bundle providing support for the Zeroconf protocol.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf b/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
index 6663e51..aeb4691 100644
--- a/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.provdisc.dhcp.ProvisioningDiscoveryDHCPActivator
Bundle-Name: DHCP provisioning discovery
Bundle-Description: A bundle providing support for DHCP provisioning discovery
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf b/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
index b068c62..6b5a3c9 100644
--- a/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.provdisc.mdns.ProvisioningDiscoveryMDNSActivator
Bundle-Name: mDNS provisioning discovery
Bundle-Description: A bundle providing support for mDNS provisioning discovery
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
index bb90e36..6fc5ea1 100644
--- a/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.bliptv.BliptvActivator
Bundle-Name: Blip.tv Preview Replacement Source
Bundle-Description: A bundle providing processing for Blip.tv previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
index 1b7757c..019f210 100644
--- a/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.dailymotion.DailymotionActivator
Bundle-Name: Dailymotion Replacement Source
Bundle-Description: A bundle providing replacement for dailymotion links.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
index a4e4e85..331f522 100644
--- a/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.directimage.DirectImageActivator
Bundle-Name: Direct Image Link Replacement Source
Bundle-Description: A bundle providing replacement for direct image links.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
index 0ea5ee1..5d91f2c 100644
--- a/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.flickr.FlickrActivator
Bundle-Name: Flickr Preview Replacement Source
Bundle-Description: A bundle providing processing for flickr previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
index 25202a5..39d1b51 100644
--- a/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.hulu.HuluActivator
Bundle-Name: Hulu Preview Replacement Source
Bundle-Description: A bundle providing processing for Hulu previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
index 651091e..df61223 100644
--- a/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.metacafe.MetacafeActivator
Bundle-Name: Metacafe Preview Replacement Source
Bundle-Description: A bundle providing processing for metacafe previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
index 02f007c..34ce08c 100644
--- a/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.smiley.SmileyActivator
Bundle-Name: Smiley Replacement Source
Bundle-Description: A bundle providing processing for smileys.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
index 100b524..7e70d84 100644
--- a/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.twitpic.TwitpicActivator
Bundle-Name: Twitpic Preview Replacement Source
Bundle-Description: A bundle providing processing for Twitpic previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
index 39ab304..60e802e 100644
--- a/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.vbox7.Vbox7Activator
Bundle-Name: Vbox7 Preview Replacement Source
Bundle-Description: A bundle providing processing for vbox7 previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
index 732d2bb..2c5ca73f 100644
--- a/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.viddler.ViddlerActivator
Bundle-Name: Viddler Preview Replacement Source
Bundle-Description: A bundle providing processing for Viddler previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
index 4829910..0b7c8a9 100644
--- a/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.vimeo.VimeoActivator
Bundle-Name: Vimeo Preview Replacement Source
Bundle-Description: A bundle providing processing for vimeo previews.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
index cbfd94c..c64f517 100644
--- a/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.replacement.youtube.YoutubeActivator
Bundle-Name: Youtube Replacement Source
Bundle-Description: A bundle providing replacement for youtube links.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 1.0.0
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf b/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
index bae99ed..83fe651 100644
--- a/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
+++ b/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.resources.ResourceManagementActivator
Bundle-Name: Resource Management Service
Bundle-Description: The plugin managing images and languages resource packs.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.resources
diff --git a/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf b/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
index e57e552..6814497 100644
--- a/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
+++ b/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.shutdowntimeout.ShutdownTimeout
Bundle-Name: ShutdownBundle
Bundle-Description: A bundle that makes sure that when closed SIP Communicator will exit in 15 seconds at most.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf b/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
index eaadf1f..ea95881 100644
--- a/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
+++ b/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.sparkle.SparkleActivator
Bundle-Name: Sparkle Auto-Update Service Provider
Bundle-Description: A bundle that launches the Sparkle framework.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf b/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
index d665ba5..7fb8867 100644
--- a/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.swingnotification.SwingNotificationActivator
Bundle-Name: Swing Notification Service Provider
Bundle-Description: A bundle which implements Swing notifications.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf b/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
index db284f9..f60184d 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.sysactivity.SysActivityActivator
Bundle-Name: System Activity Service Implementation
Bundle-Description: System Activity Service Implementation.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf b/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
index 86b2958..0f3f76e 100755
--- a/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.impl.version.VersionActivator
Bundle-Name: Version Service Implementation
Bundle-Description: Version Service Implementation.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
index 6281899..47ccf4b 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.accountinfo.AccountInfoActivator
Bundle-Name: Contact Info
Bundle-Description: A plug-in that can set cross protocol account info.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf b/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
index b42344a..70110fb 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.addrbook.AddrBookActivator
Bundle-Description: OS-specific Address Book support
Bundle-Name: OS-specific Address Book support
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Import-Package: javax.swing,
net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf b/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
index 9eec552..8bd44ca 100644
--- a/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.advancedconfig.AdvancedConfigActivator
Bundle-Name: Advanced config plugin
Bundle-Description: The plugin offering advanced configuration page.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
index ce8d9fd..b591932 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.aimaccregwizz.AimAccRegWizzActivator
Bundle-Name: AIM account registration wizard
Bundle-Description: AIM account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
index 048e7e1..9388e0d 100755
--- a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.branding.BrandingActivator
Bundle-Name: Branding plugin
Bundle-Description: Branding plugin.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf b/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
index 679e141..99a9899 100644
--- a/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.certconfig.CertConfigActivator
Bundle-Name: Certificate Configuration Plugin
Bundle-Description: Allows the configuration of general X.509 certificate settings.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: no
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
index 0991755..ac6b9eb 100644
--- a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.chatalerter.ChatAlerterActivator
Bundle-Name: Chat Alerter
Bundle-Description: A plug-in that alerts for new messages by flashing the window in the taskbar.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf b/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
index 8e62303..49d96b5 100644
--- a/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.chatconfig.ChatConfigActivator
Bundle-Name: Plugin Manager Chat
Bundle-Description: Manage all chat options.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
index c508e73..1e1e3bc 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.contactinfo.ContactInfoActivator
Bundle-Name: Contact Info
Bundle-Description: A plug-in that can show cross protocol user info.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf b/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
index f74b575..8b306b4 100644
--- a/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.contactsourceconfig.ContactSourceConfigActivator
Bundle-Description: Contact sources configuration
Bundle-Name: Contact sources configuration
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Import-Package: net.java.sip.communicator.service.contactsource,
net.java.sip.communicator.service.protocol,
diff --git a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
index 5b1a4e4..a6c46c6 100644
--- a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.defaultresourcepack.DefaultResourcePackActivator
Bundle-Name: Default Resource Pack
Bundle-Description: The plugin offering default images and languages.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
index 30831ad..7e9a51c 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.dictaccregwizz.DictAccRegWizzActivator
Bundle-Name: Dict account registration wizard
Bundle-Description: Dict account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf b/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
index 4d414c0..61c903d 100644
--- a/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.dnsconfig.DnsConfigActivator
Bundle-Name: DNSConfig
Bundle-Description: DNS configuration plugin
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: no
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
index 31f89c6..f683c87 100644
--- a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.exampleplugin.ExamplePluginActivator
Bundle-Name: Example plugin
Bundle-Description: An example showing how to make plugins for the ui.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
index 08019ec..5e5b36e 100644
--- a/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.facebookaccregwizz.FacebookAccRegWizzActivator
Bundle-Name: Facebook account registration wizard
Bundle-Description: Facebook account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
index 65917b7..91d7c24 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.generalconfig.GeneralConfigPluginActivator
Bundle-Name: General config plugin
Bundle-Description: The plugin offering general configuration page.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
index f444110..98aacf2 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.gibberishaccregwizz.GibberishAccRegWizzActivator
Bundle-Name: Gibberish account registration wizard
Bundle-Description: Gibberish account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf b/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
index 5ea6364..fae4f8d 100644
--- a/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.globalproxyconfig.GlobalProxyPluginActivator
Bundle-Name: Global Proxy Config Plugin
Bundle-Description: A plugin to configure global proxy for sip communicator
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
index 4dc8797..c63b034 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.googletalkaccregwizz.GoogleTalkAccRegWizzActivator
Bundle-Name: Google Talk account registration wizard
Bundle-Description: Google Talk account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
index cb55611..d6d6358 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.icqaccregwizz.IcqAccRegWizzActivator
Bundle-Name: ICQ account registration wizard
Bundle-Description: ICQ account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
index 3ec7734..42ed35a 100644
--- a/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.ippiaccregwizz.IppiAccRegWizzActivator
Bundle-Name: Ippi account registration wizard
Bundle-Description: Ippi account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
index 64465ca..bb42ab4 100644
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.iptelaccregwizz.IptelAccRegWizzActivator
Bundle-Name: IP Tel account registration wizard
Bundle-Description: IP Tel account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
index 1b34840..ccc4971 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.ircaccregwizz.IrcAccRegWizzActivator
Bundle-Name: IRC account registration wizard
Bundle-Description: IRC account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
index 0ab4d5d..4a06c85 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.jabberaccregwizz.JabberAccRegWizzActivator
Bundle-Name: Jabber account registration wizard
Bundle-Description: Jabber account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-package: net.java.sip.communicator.plugin.jabberaccregwizz
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
index 85d2bcb..26c5658 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.keybindingchooser.KeybindingChooserActivator
Bundle-Name: Keybinding Chooser
Bundle-Description: Provides configuring UI for keyboard shortcuts.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf b/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
index f6d602a..a6a00ba 100644
--- a/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.ldap.LdapActivator
Bundle-Description: LDAP support
Bundle-Name: LDAP support
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Import-Package: net.java.sip.communicator.service.contactsource,
net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf b/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
index c434fdc..284b596 100644
--- a/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.loggingutils.LoggingUtilsActivator
Bundle-Name: Logging utils
Bundle-Description: A bundle that provides packet logging utils as config and saving archived logs
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
index 871fefe..c151aec 100755
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.msnaccregwizz.MsnAccRegWizzActivator
Bundle-Name: Msn account registration wizard
Bundle-Description: Msn account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
new file mode 100644
index 0000000..02cf438
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
@@ -0,0 +1,464 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.msofficecomm;
+
+import java.beans.*;
+import java.util.*;
+
+import javax.swing.*;
+
+import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.util.*;
+
+import org.osgi.framework.*;
+
+/**
+ * Represents the Java counterpart of a native <tt>IMessenger</tt>
+ * implementation.
+ *
+ * @author Lyubomir Marinov
+ */
+public class Messenger
+{
+ static final int CONVERSATION_TYPE_AUDIO = 8;
+
+ static final int CONVERSATION_TYPE_IM = 1;
+
+ static final int CONVERSATION_TYPE_LIVEMEETING = 4;
+
+ static final int CONVERSATION_TYPE_PHONE = 2;
+
+ static final int CONVERSATION_TYPE_PSTN = 32;
+
+ static final int CONVERSATION_TYPE_VIDEO = 16;
+
+ static final int MISTATUS_AWAY = 0x0022;
+
+ static final int MISTATUS_MAY_BE_AVAILABLE = 0x00A2;
+
+ static final int MISTATUS_OFFLINE = 0x0001;
+
+ static final int MISTATUS_ONLINE = 0x0002;
+
+ static final int MISTATUS_UNKNOWN = 0x0000;
+
+ /**
+ * The <tt>BundleContext</tt> in which the <tt>msofficecomm</tt> bundle has
+ * been started.
+ */
+ private static BundleContext bundleContext;
+
+ private static final Map<String, Self> selves = new HashMap<String, Self>();
+
+ /**
+ * The <tt>ServiceListener</tt> which listens to the <tt>BundleContext</tt>
+ * in which the <tt>msofficecomm</tt> bundle has been started for service
+ * changes.
+ */
+ private static final ServiceListener serviceListener
+ = new ServiceListener()
+ {
+ public void serviceChanged(ServiceEvent event)
+ {
+ Messenger.serviceChanged(event);
+ }
+ };
+
+ static
+ {
+ System.loadLibrary("jmsofficecomm");
+ }
+
+ private static void addSelf(
+ String signinName,
+ ProtocolProviderService pps,
+ OperationSetPresence presenceOpSet)
+ {
+ Self self = selves.get(signinName);
+
+ if (self == null)
+ {
+ self = new Self(signinName);
+ selves.put(signinName, self);
+ }
+ self.addProtocolProviderService(pps, presenceOpSet);
+ }
+
+ private static String getSigninName(
+ Contact contact,
+ ProtocolProviderService pps)
+ {
+ String address
+ = (contact == null)
+ ? pps.getAccountID().getAccountAddress()
+ : contact.getAddress();
+ String signinName;
+
+ if (address.contains("@"))
+ {
+ String protocol = pps.getProtocolName() + ":";
+
+ if (address.toLowerCase().startsWith(protocol.toLowerCase()))
+ signinName = address.substring(protocol.length());
+ else
+ signinName = address;
+ }
+ else
+ signinName = null;
+ return signinName;
+ }
+
+ static int getStatus(MessengerContact messengerContact)
+ {
+ String signinName = messengerContact.signinName;
+ int presenceStatus;
+
+ if (signinName == null)
+ presenceStatus = Integer.MIN_VALUE;
+ else
+ {
+ Self self = selves.get(signinName);
+
+ if (self == null)
+ {
+ presenceStatus = Integer.MIN_VALUE;
+ for (Self aSelf : selves.values())
+ {
+ int aPresenceStatus = aSelf.getPresenceStatus(signinName);
+
+ if (presenceStatus < aPresenceStatus)
+ {
+ presenceStatus = aPresenceStatus;
+ if (presenceStatus >= PresenceStatus.MAX_STATUS_VALUE)
+ break;
+ }
+ }
+ }
+ else
+ presenceStatus = self.getPresenceStatus();
+ }
+
+ return presenceStatusToMISTATUS(presenceStatus);
+ }
+
+ static boolean isSelf(MessengerContact messengerContact)
+ {
+ String signinName = messengerContact.signinName;
+
+ return (signinName == null) ? false : selves.containsKey(signinName);
+ }
+
+ private static native void onContactStatusChange(
+ String signinName,
+ int status);
+
+ private static int presenceStatusToMISTATUS(int presenceStatus)
+ {
+ int mistatus;
+
+ if (presenceStatus == Integer.MIN_VALUE)
+ mistatus = MISTATUS_UNKNOWN;
+ else
+ {
+ if (presenceStatus < PresenceStatus.ONLINE_THRESHOLD)
+ mistatus = MISTATUS_OFFLINE;
+ else if (presenceStatus < PresenceStatus.AWAY_THRESHOLD)
+ mistatus = MISTATUS_MAY_BE_AVAILABLE;
+ else if (presenceStatus < PresenceStatus.AVAILABLE_THRESHOLD)
+ mistatus = MISTATUS_AWAY;
+ else
+ mistatus = MISTATUS_ONLINE;
+ }
+ return mistatus;
+ }
+
+ private static void removeSelf(
+ String signinName,
+ ProtocolProviderService pps)
+ {
+ Self self = selves.get(signinName);
+
+ if ((self != null) && (self.removeProtocolProviderService(pps) < 1))
+ selves.remove(signinName);
+ }
+
+ private static void serviceChanged(ServiceEvent event)
+ {
+ Object service = bundleContext.getService(event.getServiceReference());
+
+ if (service instanceof ProtocolProviderService)
+ {
+ ProtocolProviderService pps = (ProtocolProviderService) service;
+ /*
+ * The Messenger class implements an integration of Jitsi presence
+ * into Microsoft Office so the only accounts of interest to it are
+ * the ones which support presence.
+ */
+ OperationSetPresence presenceOpSet
+ = pps.getOperationSet(OperationSetPresence.class);
+
+ if (presenceOpSet != null)
+ {
+ String signinName = getSigninName(null, pps);
+
+ if (signinName != null)
+ {
+ switch (event.getType())
+ {
+ case ServiceEvent.REGISTERED:
+ addSelf(signinName, pps, presenceOpSet);
+ break;
+ case ServiceEvent.UNREGISTERING:
+ removeSelf(signinName, pps);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ static void start(BundleContext bundleContext)
+ throws Exception
+ {
+ Messenger.bundleContext = bundleContext;
+
+ bundleContext.addServiceListener(serviceListener);
+ for (ServiceReference reference
+ : bundleContext.getServiceReferences(
+ ProtocolProviderService.class.getName(),
+ null))
+ {
+ serviceListener.serviceChanged(
+ new ServiceEvent(ServiceEvent.REGISTERED, reference));
+ }
+ }
+
+ static void stop(BundleContext bundleContext)
+ throws Exception
+ {
+ bundleContext.removeServiceListener(serviceListener);
+
+ Messenger.bundleContext = null;
+ }
+
+ /**
+ * Initializes a new <tt>Messenger</tt> instance which is to represent the
+ * Java counterpart of a native <tt>IMessenger</tt> implementation.
+ */
+ public Messenger()
+ {
+ }
+
+ public void startConversation(
+ final int conversationType,
+ final String[] participants)
+ {
+ SwingUtilities.invokeLater(
+ new Runnable()
+ {
+ public void run()
+ {
+ BundleContext bundleContext = Messenger.bundleContext;
+
+ if (bundleContext != null)
+ {
+ UIService uiService
+ = ServiceUtils.getService(
+ bundleContext,
+ UIService.class);
+
+ if (uiService != null)
+ {
+ switch (conversationType)
+ {
+ case CONVERSATION_TYPE_AUDIO:
+ case CONVERSATION_TYPE_PHONE:
+ case CONVERSATION_TYPE_PSTN:
+ uiService.createCall(participants);
+ break;
+ case CONVERSATION_TYPE_IM:
+ uiService.startChat(participants);
+ break;
+ }
+ }
+ }
+ }
+ });
+ }
+
+ private static class Self
+ implements ContactPresenceStatusListener,
+ ProviderPresenceStatusListener
+ {
+ private final Map<ProtocolProviderService, OperationSetPresence> ppss
+ = new HashMap<ProtocolProviderService, OperationSetPresence>();
+
+ private int presenceStatus = Integer.MIN_VALUE;
+
+ public final String signinName;
+
+ public Self(String signinName)
+ {
+ this.signinName = signinName;
+ }
+
+ void addProtocolProviderService(
+ ProtocolProviderService pps,
+ OperationSetPresence presenceOpSet)
+ {
+ if (!ppss.containsKey(pps))
+ {
+ ppss.put(pps, presenceOpSet);
+
+ presenceOpSet.addContactPresenceStatusListener(this);
+ presenceOpSet.addProviderPresenceStatusListener(this);
+ providerStatusChanged(null);
+ }
+ }
+
+ public void contactPresenceStatusChanged(
+ ContactPresenceStatusChangeEvent event)
+ {
+ String signinName
+ = getSigninName(
+ event.getSourceContact(),
+ event.getSourceProvider());
+
+ if (signinName != null)
+ {
+ PresenceStatus oldStatus = event.getOldStatus();
+
+ Messenger.onContactStatusChange(
+ signinName,
+ presenceStatusToMISTATUS(
+ (oldStatus == null)
+ ? Integer.MIN_VALUE
+ : oldStatus.getStatus()));
+ }
+ }
+
+ int getPresenceStatus()
+ {
+ return presenceStatus;
+ }
+
+ int getPresenceStatus(String signinName)
+ {
+ int presenceStatus;
+
+ if (this.signinName.equals(signinName))
+ presenceStatus = getPresenceStatus();
+ else
+ {
+ presenceStatus = Integer.MIN_VALUE;
+ for (OperationSetPresence presenceOpSet : ppss.values())
+ {
+ try
+ {
+ Contact contact
+ = presenceOpSet.findContactByID(signinName);
+
+ if (contact != null)
+ {
+ PresenceStatus contactPresenceStatus
+ = contact.getPresenceStatus();
+
+ if (contactPresenceStatus != null)
+ {
+ int contactStatus
+ = contactPresenceStatus.getStatus();
+
+ if (presenceStatus < contactStatus)
+ {
+ presenceStatus = contactStatus;
+ if (presenceStatus
+ >= PresenceStatus.MAX_STATUS_VALUE)
+ break;
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ /*
+ * It does not sound like it makes a lot of sense to
+ * fail the getting of the presence status of the
+ * specified signinName just because one of the possibly
+ * many OperationSetPresence instances has failed.
+ * Additionally, the native counterpart will swallow any
+ * Java exception anyway.
+ */
+ if (t instanceof ThreadDeath)
+ throw (ThreadDeath) t;
+ else
+ t.printStackTrace(System.err);
+ }
+ }
+ }
+ return presenceStatus;
+ }
+
+ public void providerStatusChanged(
+ ProviderPresenceStatusChangeEvent event)
+ {
+ PresenceStatus presenceStatus = null;
+
+ for (OperationSetPresence presenceOpSet : ppss.values())
+ {
+ PresenceStatus presenceOpSetStatus
+ = presenceOpSet.getPresenceStatus();
+
+ if (presenceOpSetStatus != null)
+ {
+ if ((presenceStatus == null)
+ || (presenceStatus.compareTo(presenceOpSetStatus)
+ < 0))
+ presenceStatus = presenceOpSetStatus;
+ }
+ }
+
+ setPresenceStatus(presenceStatus);
+ }
+
+ public void providerStatusMessageChanged(PropertyChangeEvent event) {}
+
+ int removeProtocolProviderService(ProtocolProviderService pps)
+ {
+ OperationSetPresence presenceOpSet = ppss.get(pps);
+
+ if (presenceOpSet != null)
+ {
+ presenceOpSet.removeContactPresenceStatusListener(this);
+ presenceOpSet.removeProviderPresenceStatusListener(this);
+ ppss.remove(pps);
+ providerStatusChanged(null);
+ }
+ return ppss.size();
+ }
+
+ private void setPresenceStatus(PresenceStatus presenceStatus)
+ {
+ int status
+ = (presenceStatus == null)
+ ? Integer.MIN_VALUE
+ : presenceStatus.getStatus();
+
+ if (this.presenceStatus != status)
+ {
+ int oldValue = this.presenceStatus;
+
+ this.presenceStatus = status;
+
+ Messenger.onContactStatusChange(
+ signinName,
+ presenceStatusToMISTATUS(oldValue));
+ }
+ }
+ }
+}
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/MessengerContact.java b/src/net/java/sip/communicator/plugin/msofficecomm/MessengerContact.java
new file mode 100644
index 0000000..abf9d15
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/MessengerContact.java
@@ -0,0 +1,60 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.msofficecomm;
+
+/**
+ * Represents the Java counterpart of a native <tt>IMessengerContact</tt>
+ * implementation.
+ *
+ * @author Lyubomir Marinov
+ */
+public class MessengerContact
+{
+ /**
+ * The sign-in name associated with the native <tt>IMessengerContact</tt>
+ * implementation represented by this instance.
+ */
+ public final String signinName;
+
+ /**
+ * Initializes a new <tt>MessengerContact</tt> instance which is to
+ * represent the Java counterpart of a native <tt>IMessengerContact</tt>
+ * implementation associated with a specific sign-in name.
+ *
+ * @param signinName the sign-in name associated with the native
+ * <tt>IMessengerContact</tt> implementation which is to be represented by
+ * the new instance
+ */
+ public MessengerContact(String signinName)
+ {
+ this.signinName = signinName;
+ }
+
+ /**
+ * Gets the connection/presence status of the contact associated with this
+ * instance in the form of a <tt>MISTATUS</tt> value.
+ *
+ * @return a <tt>MISTATUS</tt> value which specifies the connection/presence
+ * status of the contact associated with this instance
+ */
+ public int getStatus()
+ {
+ return Messenger.getStatus(this);
+ }
+
+ /**
+ * Gets the indicator which determines whether this
+ * <tt>MessengerContact</tt> is the same user as the current client user.
+ *
+ * @return <tt>true</tt> if this <tt>MessengerContact</tt> is the same user
+ * as the current client user; otherwise, <tt>false</tt>
+ */
+ public boolean isSelf()
+ {
+ return Messenger.isSelf(this);
+ }
+}
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java b/src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java
new file mode 100644
index 0000000..05bd7cc
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java
@@ -0,0 +1,75 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.msofficecomm;
+
+import org.osgi.framework.*;
+
+/**
+ * Implements {@link BundleActivator} for the <tt>msofficecomm</tt> bundle.
+ *
+ * @author Lyubomir Marinov
+ */
+public class MsOfficeCommActivator
+ implements BundleActivator
+{
+ /**
+ * Starts the <tt>msofficecomm</tt> bundle in a specific
+ * {@link BundleContext}.
+ *
+ * @param bundleContext the <tt>BundleContext</tt> in which the
+ * <tt>msofficecomm</tt> bundle is to be started
+ * @throws Exception if anything goes wrong while starting the
+ * <tt>msofficecomm</tt> bundle in the specified <tt>BundleContext</tt>
+ */
+ public void start(BundleContext bundleContext)
+ throws Exception
+ {
+ Messenger.start(bundleContext);
+
+ boolean stopMessenger = true;
+
+ try
+ {
+ int hresult = OutOfProcessServer.start();
+
+ if (hresult < 0)
+ throw new RuntimeException("HRESULT " + hresult);
+ else
+ stopMessenger = false;
+ }
+ finally
+ {
+ if (stopMessenger)
+ Messenger.stop(bundleContext);
+ }
+ }
+
+ /**
+ * Stops the <tt>msofficecomm</tt> bundle in a specific
+ * {@link BundleContext}.
+ *
+ * @param bundleContext the <tt>BundleContext</tt> in which the
+ * <tt>msofficecomm</tt> bundle is to be stopped
+ * @throws Exception if anything goes wrong while stopping the
+ * <tt>msofficecomm</tt> bundle in the specified <tt>BundleContext</tt>
+ */
+ public void stop(BundleContext bundleContext)
+ throws Exception
+ {
+ try
+ {
+ int hresult = OutOfProcessServer.stop();
+
+ if (hresult < 0)
+ throw new RuntimeException("HRESULT " + hresult);
+ }
+ finally
+ {
+ Messenger.stop(bundleContext);
+ }
+ }
+}
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/OutOfProcessServer.java b/src/net/java/sip/communicator/plugin/msofficecomm/OutOfProcessServer.java
new file mode 100644
index 0000000..7947f64
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/OutOfProcessServer.java
@@ -0,0 +1,27 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.msofficecomm;
+
+class OutOfProcessServer
+{
+ static
+ {
+ System.loadLibrary("jmsofficecomm");
+ }
+
+ static native int start();
+
+ static native int stop();
+
+ /**
+ * Prevents the initialization of a new <tt>OutOfProcessServer</tt>
+ * instance.
+ */
+ private OutOfProcessServer()
+ {
+ }
+}
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf b/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
new file mode 100644
index 0000000..1f30939
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
@@ -0,0 +1,11 @@
+Bundle-Activator: net.java.sip.communicator.plugin.msofficecomm.MsOfficeCommActivator
+Bundle-Description: Microsoft Office Communicator
+Bundle-Name: Microsoft Office Communicator
+Bundle-Vendor: jitsi.org
+Bundle-Version: 0.0.1
+Import-Package: javax.swing,
+ net.java.sip.communicator.service.gui,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.util,
+ org.osgi.framework
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
index 7d2106e..2f0b01f 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.notificationconfiguration.NotificationConfigurationActivator
Bundle-Name: Plugin Manager Notification
Bundle-Description: Manage all SIP Communicator notification.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf b/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
index 00d884e..0ad7d44 100644
--- a/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.notificationwiring.NotificationWiringActivator
Bundle-Name: Notification-Wiring
Bundle-Description: Wires events from various bundles to the notification service
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf b/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf
index edcab21..24aabd8 100644
--- a/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.otr.OtrActivator
Bundle-Name: OTR (Off-the-Record) Messaging
Bundle-Description: Support for secure, Off The Record messaging in SIP Communicator
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf b/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
index d34c0c7..71cd57e 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.pluginmanager.PluginManagerActivator
Bundle-Name: Plugin Manager plugin
Bundle-Description: Manage all SIP Communicator plugins.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
index 3b946d6..b817d45 100644
--- a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.profiler4j.ProfilerActivator
Bundle-Name: Integrated profiler plugin
Bundle-Description: A bundle that provides profile cpu and memory of the running app.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.apache.commons.logging,
diff --git a/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf b/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf
index ea2d941..8b9305b 100644
--- a/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.provisioning.ProvisioningActivator
Bundle-Name: Provisioning plugin
Bundle-Description: Provisioning
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf b/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf
index 24d859e..a2b463f 100644
--- a/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.reconnectplugin.ReconnectPluginActivator
Bundle-Name: ReconnectPlugin
Bundle-Description: A bundle that implements the Reconnect Plugin Package.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
index 399058b..60c6429 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.rssaccregwizz.RssAccRegWizzActivator
Bundle-Name: Rss account registration wizard
Bundle-Description: Rss account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf b/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf
index f23ae03..1fb372e 100644
--- a/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.securityconfig.SecurityConfigActivator
Bundle-Name: Security Configuration Form
Bundle-Description: The configuration form for security
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
index bbde792..242e94f 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.simpleaccreg.SimpleAccountRegistrationActivator
Bundle-Name: Simple account registration form
Bundle-Description: Simple account registration form.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
index a247f93..d949562 100644
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.sip2sipaccregwizz.Sip2SipAccRegWizzActivator
Bundle-Name: Sip 2 Sip account registration wizard
Bundle-Description: Sip 2 Sip account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
index a20807b..3c75af4 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.sipaccregwizz.SIPAccRegWizzActivator
Bundle-Name: SIP account registration wizard
Bundle-Description: SIP account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-package: net.java.sip.communicator.plugin.sipaccregwizz
diff --git a/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf b/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf
index 21f7705..bfe0c71 100644
--- a/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.skinmanager.SkinManagerActivator
Bundle-Name: Skin Manager plugin
Bundle-Description: Manage all SIP Communicator skins.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf b/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf
index 8d4dfde..d64b306 100644
--- a/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Activator: net.java.sip.communicator.plugin.skinresourcepack.SkinResourcePack
Bundle-Name: Skin Resource Pack
Bundle-Description: The plugin offering skin related data.
-Bundle-Vendor: sip-communicator.org, Adam Netocny, CircleTech, s.r.o.
+Bundle-Vendor: jitsi.org, Adam Netocny, CircleTech, s.r.o.
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf b/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf
index cf41de6..aaf6547 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.spellcheck.SpellCheckActivator
Bundle-Name: Spell Checker
Bundle-Description: Provides interactive spell checking of messages being composed.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
index 2dcc971..f6c650f 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.sshaccregwizz.SSHAccRegWizzActivator
Bundle-Name: SSH account registration wizard
Bundle-Description: SSH account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
index 5e00896..080d8f9 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.whiteboard.WhiteboardActivator
Bundle-Name: Whiteboard plugin
Bundle-Description: A whiteboard for SIP-Communicator.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
index 6590ee3..aecb0aa 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.yahooaccregwizz.YahooAccRegWizzActivator
Bundle-Name: Yahoo account registration wizard
Bundle-Description: Yahoo account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
index c9cb1a0..728fedc 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.plugin.zeroconfaccregwizz.ZeroconfAccRegWizzActivator
Bundle-Name: Zeroconf account registration wizard
Bundle-Description: Zeroconf account registration wizard.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf b/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf
index d665aa5..9888dd8 100644
--- a/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf
+++ b/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: Argument Delegation Service
Bundle-Description: A service that allows bundles to register as handlers for specific command line arguments
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.argdelegation
diff --git a/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf b/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf
index f272967..281912d 100644
--- a/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf
+++ b/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: Contact Event Handler service
Bundle-Description: Contact Event Handler service
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/contactlist/MetaContactListService.java b/src/net/java/sip/communicator/service/contactlist/MetaContactListService.java
index bf2a3c4..39f1284 100644
--- a/src/net/java/sip/communicator/service/contactlist/MetaContactListService.java
+++ b/src/net/java/sip/communicator/service/contactlist/MetaContactListService.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.service.protocol.*;
* list including contacts from all implemented protocols.
* <p>
* An implementation of the <tt>MetaContactListService</tt> would take care
- * of synchronizing the local copy ot the contact list with the versions stored
+ * of synchronizing the local copy of the contact list with the versions stored
* on the various server protocols.
* <p>
* All modules that would for some reason like to query or modify the contact
@@ -27,7 +27,7 @@ import net.java.sip.communicator.service.protocol.*;
* protocol specific contacts so that they represent a single person or identity.
* Every protocol specific <tt>Contact</tt> would therefore automatically
* be assigned to a corresponding <tt>MetaContact</tt>. A single
- * MetaContact may containg multiple contacts (e.g. a single person often
+ * MetaContact may containing multiple contacts (e.g. a single person often
* has accounts in different protocols) while a single protocol specific
* Contact may only be assigned to a exactly one MetaContact.
* <p>
@@ -78,7 +78,7 @@ public interface MetaContactListService
/**
* Returns the meta contact group that is a direct parent of the specified
* <tt>child</tt>.
- * @param child the <tt>MetaContactGroup</tt> whose paret group we're
+ * @param child the <tt>MetaContactGroup</tt> whose parent group we're
* looking for. If no parent is found <tt>null</tt> is returned.
*
* @return the <tt>MetaContactGroup</tt> that contains <tt>child</tt> or
@@ -89,7 +89,7 @@ public interface MetaContactListService
/**
* Returns the meta contact group that is a direct parent of the specified
* <tt>child</tt>. If no parent is found <tt>null</tt> is returned.
- * @param child the <tt>MetaContact</tt> whose paret group we're looking
+ * @param child the <tt>MetaContact</tt> whose parent group we're looking
* for.
*
* @return the <tt>MetaContactGroup</tt> that contains <tt>child</tt> or
@@ -107,7 +107,7 @@ public interface MetaContactListService
*
* @param contact the contact whose encapsulating meta contact we're looking
* for.
- * @return the MetaContact containing the speicified contact or null
+ * @return the MetaContact containing the specified contact or <tt>null</tt>
* if no such contact is present in this contact list.
*/
public MetaContact findMetaContactByContact(Contact contact);
@@ -117,7 +117,7 @@ public interface MetaContactListService
* group or null if no such MetaContactGroup was found.
*
* @param group the group whose encapsulating meta group we're looking for.
- * @return the MetaContact containing the speicified contact or null
+ * @return the MetaContact containing the specified contact or <tt>null</tt>
* if no such contact is present in this contact list.
*/
public MetaContactGroup findMetaContactGroupByContactGroup(
@@ -128,8 +128,8 @@ public interface MetaContactListService
* Returns the MetaContact that corresponds to the specified metaContactID.
*
* @param metaContactID a String identifier of a meta contact.
- * @return the MetaContact with the speicified string identifier or null
- * if no such meta contact was found.
+ * @return the MetaContact with the specified string identifier or
+ * <tt>null</tt> if no such meta contact was found.
*/
public MetaContact findMetaContactByMetaUID(String metaContactID);
@@ -258,7 +258,7 @@ public interface MetaContactListService
/**
* First makes the specified protocol provider create a contact
* corresponding to the specified <tt>contactID</tt>, then creates a new
- * MetaContact which will encapsulate the newly crated protocol specific
+ * MetaContact which will encapsulate the newly-created protocol specific
* contact. Depending on implementations the method may sometimes need
* time to complete as it may be necessary for an underlying protocol to
* wait for a server to acknowledge addition of the contact.
diff --git a/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf b/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf
index 604ebd8..065d055 100755
--- a/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf
+++ b/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: Contactlist Service Interfaces
Bundle-Description: Contactlist Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf b/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
index cbb4aa2..7b06df7 100644
--- a/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
+++ b/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: Contact Source Service Interfaces
Bundle-Description: ContactSource Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/gui/UIService.java b/src/net/java/sip/communicator/service/gui/UIService.java
index 111c474..d1cbf81 100644
--- a/src/net/java/sip/communicator/service/gui/UIService.java
+++ b/src/net/java/sip/communicator/service/gui/UIService.java
@@ -47,6 +47,7 @@ import net.java.sip.communicator.service.gui.event.*;
* @author Yana Stamcheva
* @author Dmitri Melnikov
* @author Adam Netocny
+ * @author Lyubomir Marinov
*/
public interface UIService
{
@@ -438,4 +439,8 @@ public interface UIService
* to runtime apply a skin and refresh automatically the user interface.
*/
public void repaintUI();
+
+ public void createCall(String[] participants);
+
+ public void startChat(String[] participants);
} \ No newline at end of file
diff --git a/src/net/java/sip/communicator/service/gui/gui.manifest.mf b/src/net/java/sip/communicator/service/gui/gui.manifest.mf
index e35b3ec..6203f68 100644
--- a/src/net/java/sip/communicator/service/gui/gui.manifest.mf
+++ b/src/net/java/sip/communicator/service/gui/gui.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.service.gui.internal.GuiServiceActivator
Bundle-Name: UI Service
Bundle-Description: The User Interface Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
index c4416c3..b3850e9 100644
--- a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
+++ b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.service.httputil.HttpUtilActivator
Bundle-Name: SIP Communicator Http Utility Packages
Bundle-Description: A bundle that export packages with http utility classes.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.xml.sax,
diff --git a/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf b/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf
index 25e8675..1289e05 100644
--- a/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: LDAP Service Implementation
Bundle-Description: LDAP Service Implementation.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Import-Package: org.osgi.framework,
javax.naming.directory,
diff --git a/src/net/java/sip/communicator/service/notification/notification.manifest.mf b/src/net/java/sip/communicator/service/notification/notification.manifest.mf
index 33106a4..8a0240d 100644
--- a/src/net/java/sip/communicator/service/notification/notification.manifest.mf
+++ b/src/net/java/sip/communicator/service/notification/notification.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.service.notification.NotificationServiceActivator
Bundle-Name: Notifications
Bundle-Description: An implementation of the Notification service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.notification,
diff --git a/src/net/java/sip/communicator/service/protocol/PresenceStatus.java b/src/net/java/sip/communicator/service/protocol/PresenceStatus.java
index 4d8d966..f4b7a9e 100644
--- a/src/net/java/sip/communicator/service/protocol/PresenceStatus.java
+++ b/src/net/java/sip/communicator/service/protocol/PresenceStatus.java
@@ -194,7 +194,7 @@ public class PresenceStatus
*/
public int compareTo(PresenceStatus target)
throws ClassCastException,
- NullPointerException
+ NullPointerException
{
return (getStatus() - target.getStatus());
}
diff --git a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf
index c855c6f..8f640cb 100644
--- a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf
+++ b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.service.protocol.media.ProtocolMediaActivator
Bundle-Name: Media Utilities for the Protocol Provider Service
Bundle-Description: Media Utilities for the Protocol Provider Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
index 775a2ab..00a5c74 100644
--- a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
+++ b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.service.protocol.ProtocolProviderActivator
Bundle-Name: Protocol Provider Service
Bundle-Description: Protocol Provider Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf b/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf
index 69e9d6c..8790e7d 100644
--- a/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: Provisioning Discovery Service
Bundle-Description: Provisioning Discovery Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.provdisc,
diff --git a/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf b/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf
index 28053f1..c580e7e 100644
--- a/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf
+++ b/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: Replacement Service
Bundle-Description: Replacement Service.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.replacement,
diff --git a/src/net/java/sip/communicator/service/version/version.manifest.mf b/src/net/java/sip/communicator/service/version/version.manifest.mf
index 26352b5..6183ebf 100755
--- a/src/net/java/sip/communicator/service/version/version.manifest.mf
+++ b/src/net/java/sip/communicator/service/version/version.manifest.mf
@@ -1,6 +1,6 @@
Bundle-Name: Version Service Implementation
Bundle-Description: Version Service Implementation.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Export-Package: net.java.sip.communicator.service.version
diff --git a/src/net/java/sip/communicator/util/dns/util.dns.manifest.mf b/src/net/java/sip/communicator/util/dns/util.dns.manifest.mf
index 1ec80b3..dbbdaec 100644
--- a/src/net/java/sip/communicator/util/dns/util.dns.manifest.mf
+++ b/src/net/java/sip/communicator/util/dns/util.dns.manifest.mf
@@ -2,7 +2,7 @@ Bundle-Activator: net.java.sip.communicator.util.dns.DnsUtilActivator
Bundle-Name: SIP Communicator DNS Utility Packages
Bundle-SymbolicName: net.java.sip.communicator.util.dns
Bundle-Description: A bundle that export packages with DNS utility classes.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package:
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 8e980fc..2189026 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -1,7 +1,7 @@
Bundle-Activator: net.java.sip.communicator.util.UtilActivator
Bundle-Name: SIP Communicator Utility Packages
Bundle-Description: A bundle that export packages with utility classes.
-Bundle-Vendor: sip-communicator.org
+Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.xml.sax,