aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2012-02-13 13:16:20 +0000
committerDamian Minkov <damencho@jitsi.org>2012-02-13 13:16:20 +0000
commit6faa9cecec62b42880f14b25f4a90430ab321a41 (patch)
treebdb33e7fc30a9e39da42c43485e5be78639beebc
parent94be44cff1322db22885921a5042ec15c90925fa (diff)
downloadjitsi-6faa9cecec62b42880f14b25f4a90430ab321a41.zip
jitsi-6faa9cecec62b42880f14b25f4a90430ab321a41.tar.gz
jitsi-6faa9cecec62b42880f14b25f4a90430ab321a41.tar.bz2
Fixes problem with deleting chars on macosx java 1.5 and handling some special chars in the written text.
Fixes subsequent open of chat history urls when trying to focus back on the chat conversation by clicking the mouse on the chat history panel.
-rwxr-xr-xsrc/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java4
-rw-r--r--src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java8
2 files changed, 12 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index a3cf2d2..4e02032 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -1078,6 +1078,10 @@ public class ChatConversationPanel
&& currentHref != null && currentHref.length() != 0)
{
GuiActivator.getBrowserLauncher().openURL(currentHref);
+
+ // after opening the link remove the currentHref to avoid
+ // clicking on the window to gain focus to open the link again
+ this.currentHref = "";
}
}
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java b/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java
index 5adfbbc..b00bc1a 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java
+++ b/src/net/java/sip/communicator/plugin/spellcheck/DocUnderliner.java
@@ -264,6 +264,10 @@ abstract class DocUnderliner
String msg = "Bad bounds (programmer error in spell checker)";
logger.error(msg, exc);
}
+ catch (Throwable exc)
+ {
+ logger.error("Error words processing", exc);
+ }
promptRepaint();
}
@@ -300,6 +304,10 @@ abstract class DocUnderliner
String msg = "Bad bounds (programmer error in spell checker)";
logger.error(msg, exc);
}
+ catch (Throwable exc)
+ {
+ logger.error("Error words processing", exc);
+ }
}
public void changedUpdate(DocumentEvent e)