diff --git a/resources/images/impl/gui/common/smileys/default/smiley1.gif b/resources/images/impl/gui/common/smileys/default/smiley1.gif index 5d848a5cc..044c42eb4 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley1.gif and b/resources/images/impl/gui/common/smileys/default/smiley1.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley10.gif b/resources/images/impl/gui/common/smileys/default/smiley10.gif index 7203414dc..f89d79276 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley10.gif and b/resources/images/impl/gui/common/smileys/default/smiley10.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley11.gif b/resources/images/impl/gui/common/smileys/default/smiley11.gif index a68877fd3..81bf7e722 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley11.gif and b/resources/images/impl/gui/common/smileys/default/smiley11.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley12.gif b/resources/images/impl/gui/common/smileys/default/smiley12.gif index 1a920b6ea..577229c9d 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley12.gif and b/resources/images/impl/gui/common/smileys/default/smiley12.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley13.gif b/resources/images/impl/gui/common/smileys/default/smiley13.gif index 0dd3d943a..0e017cfd3 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley13.gif and b/resources/images/impl/gui/common/smileys/default/smiley13.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley14.gif b/resources/images/impl/gui/common/smileys/default/smiley14.gif index 2455df07b..19e6ec41b 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley14.gif and b/resources/images/impl/gui/common/smileys/default/smiley14.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley15.gif b/resources/images/impl/gui/common/smileys/default/smiley15.gif index b2b08468c..4404fc83c 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley15.gif and b/resources/images/impl/gui/common/smileys/default/smiley15.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley16.gif b/resources/images/impl/gui/common/smileys/default/smiley16.gif index 5a23b2c9f..f71c75c12 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley16.gif and b/resources/images/impl/gui/common/smileys/default/smiley16.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley17.gif b/resources/images/impl/gui/common/smileys/default/smiley17.gif index c0522e894..e0b9a3f54 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley17.gif and b/resources/images/impl/gui/common/smileys/default/smiley17.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley18.gif b/resources/images/impl/gui/common/smileys/default/smiley18.gif index 1941b268b..016be2b17 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley18.gif and b/resources/images/impl/gui/common/smileys/default/smiley18.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley19.gif b/resources/images/impl/gui/common/smileys/default/smiley19.gif index fec5961af..17d6f3519 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley19.gif and b/resources/images/impl/gui/common/smileys/default/smiley19.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley2.gif b/resources/images/impl/gui/common/smileys/default/smiley2.gif index f2de9e538..fb1500991 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley2.gif and b/resources/images/impl/gui/common/smileys/default/smiley2.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley20.gif b/resources/images/impl/gui/common/smileys/default/smiley20.gif index c94ef42b2..ae1ae99c9 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley20.gif and b/resources/images/impl/gui/common/smileys/default/smiley20.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley3.gif b/resources/images/impl/gui/common/smileys/default/smiley3.gif index a67217156..5fd4d78fd 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley3.gif and b/resources/images/impl/gui/common/smileys/default/smiley3.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley4.gif b/resources/images/impl/gui/common/smileys/default/smiley4.gif index acd0b349e..c5a256fda 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley4.gif and b/resources/images/impl/gui/common/smileys/default/smiley4.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley5.gif b/resources/images/impl/gui/common/smileys/default/smiley5.gif index 9006435e8..f0c3773cd 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley5.gif and b/resources/images/impl/gui/common/smileys/default/smiley5.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley6.gif b/resources/images/impl/gui/common/smileys/default/smiley6.gif index 354e4afe1..c889ed7cb 100644 Binary files a/resources/images/impl/gui/common/smileys/default/smiley6.gif and b/resources/images/impl/gui/common/smileys/default/smiley6.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley6.png b/resources/images/impl/gui/common/smileys/default/smiley6.png deleted file mode 100644 index 4f84e7272..000000000 Binary files a/resources/images/impl/gui/common/smileys/default/smiley6.png and /dev/null differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley7.gif b/resources/images/impl/gui/common/smileys/default/smiley7.gif index 3e34dd4a4..7802d426c 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley7.gif and b/resources/images/impl/gui/common/smileys/default/smiley7.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley8.gif b/resources/images/impl/gui/common/smileys/default/smiley8.gif index 797690a51..15957341f 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley8.gif and b/resources/images/impl/gui/common/smileys/default/smiley8.gif differ diff --git a/resources/images/impl/gui/common/smileys/default/smiley9.gif b/resources/images/impl/gui/common/smileys/default/smiley9.gif index 9713325d6..3fe042a7c 100755 Binary files a/resources/images/impl/gui/common/smileys/default/smiley9.gif and b/resources/images/impl/gui/common/smileys/default/smiley9.gif differ diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java index 5754409ef..174efa6d4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java @@ -218,7 +218,8 @@ public void mouseEntered(MouseEvent e) smileyItem.setIcon(imageIcon); smileyDescriptionLabel.setText(smiley.getDescription()); - smileyTextLabel.setText(smiley.getDefaultString()); + smileyTextLabel.setText( + "" + smiley.getDefaultString() + ""); } /** diff --git a/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java b/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java index ad3c63f34..cf453df45 100644 --- a/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java +++ b/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java @@ -52,7 +52,7 @@ public static Collection getDefaultSmileyPack() ":~-(", ":~(", "(upset)" }, "Upset")); defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY6", - new String[] {"(L)" , "(l)", "(H)", "(h)"}, "In love")); + new String[] {"<3", "(L)" , "(l)", "(H)", "(h)"}, "In love")); defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY7", new String[] {"(blush)"}, "Blushing"));