diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-03-11 22:15:03 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-03-11 22:15:03 +0100 |
| commit | 85901329b0794b136b96bf745f4ab1572806fc89 (patch) | |
| tree | f23da7e97cae727f39d825f0fef8348cffb238e4 /src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java | |
| parent | 3db2e44f186c59429901b2c899e139ea60117a55 (diff) | |
| parent | cf5da997da8820b4050f5b87ee9440a0ede36d1f (diff) | |
| download | jitsi-master.zip jitsi-master.tar.gz jitsi-master.tar.bz2 | |
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java index 264f830..51b3a67 100644 --- a/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java +++ b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java @@ -28,7 +28,6 @@ import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.ServerStoredDetails.*; import net.java.sip.communicator.service.protocol.event.*; import net.java.sip.communicator.service.protocol.jabberconstants.*; -import net.java.sip.communicator.service.protocol.yahooconstants.*; import net.java.sip.communicator.util.*; import org.jitsi.service.configuration.*; @@ -168,18 +167,16 @@ public class Messenger static { - String lib = "jmsofficecomm"; - try { - System.loadLibrary(lib); + System.loadLibrary("jmsofficecomm"); } catch (Throwable t) { - logger.error( - "Failed to load native library " + lib + ": " - + t.getMessage()); - RegistryHandler.checkRegistryKeys(); + logger.error("Couldn't load jmsofficecomm. If you are debugging," + + " make sure that HKLM\\SOFTWARE[\\Wow6432Node]\\Microsoft\\" + + "Office\\Outlook\\Call Integration\\IMApplication is set to" + + " javaw.exe; " + t.getMessage()); throw new RuntimeException(t); } } @@ -1125,11 +1122,6 @@ public class Messenger { mistatus = MISTATUS_ON_THE_PHONE; } - else if (ProtocolNames.YAHOO.equalsIgnoreCase(protocolName) - && YahooStatusEnum.ON_THE_PHONE.equals(presenceStatus)) - { - mistatus = MISTATUS_ON_THE_PHONE; - } else if ((i == 32 /* FIXME */) && ProtocolNames.JABBER.equalsIgnoreCase(protocolName) && JabberStatusEnum.IN_A_MEETING.equalsIgnoreCase( |