From 8c53aa5de82610b6e670bc85abb80492f50f7af7 Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Fri, 19 Sep 2014 12:49:34 +0200
Subject: [PATCH] Adds a 'wink' smiley to the default smiley pack.

---
 resources/images/images.properties               |   1 +
 .../impl/gui/common/smileys/default/smiley21.gif | Bin 0 -> 2301 bytes
 .../impl/gui/main/chat/SmileysSelectorBox.java   |   4 +++-
 .../impl/replacement/smiley/Resources.java       |   5 ++++-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 resources/images/impl/gui/common/smileys/default/smiley21.gif

diff --git a/resources/images/images.properties b/resources/images/images.properties
index 72361de4f..1d29759ba 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -327,6 +327,7 @@ service.gui.smileys.SMILEY17=resources/images/impl/gui/common/smileys/default/sm
 service.gui.smileys.SMILEY18=resources/images/impl/gui/common/smileys/default/smiley18.gif
 service.gui.smileys.SMILEY19=resources/images/impl/gui/common/smileys/default/smiley19.gif
 service.gui.smileys.SMILEY20=resources/images/impl/gui/common/smileys/default/smiley20.gif
+service.gui.smileys.SMILEY21=resources/images/impl/gui/common/smileys/default/smiley21.gif
 
 # Look and Feel images
 service.gui.lookandfeel.CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png
diff --git a/resources/images/impl/gui/common/smileys/default/smiley21.gif b/resources/images/impl/gui/common/smileys/default/smiley21.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7fea717bb26fc65a7dadba0b19f63d2d62e2ea27
GIT binary patch
literal 2301
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

literal 0
HcmV?d00001

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 c09760ba2..5506f7b04 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
@@ -112,7 +112,9 @@ private Dimension calculateGridDimensions(int itemsCount)
          * Was the intention to have the division produce a real number?
          */
         int gridRowCount = itemsCount / gridColCount;
-        
+        if (itemsCount > gridRowCount*gridColCount)
+            gridColCount++;
+
         return new Dimension(gridColCount, gridRowCount);
     }
 
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 759185683..ec951e4e8 100644
--- a/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java
+++ b/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java
@@ -68,7 +68,7 @@ public static Collection<Smiley> getDefaultSmileyPack()
             new String[] {"(y)", "(Y)", "(ok)"}, "Ok"));
 
         defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY11",
-            new String[] {";-)", ";)", ":-)", ":)"}, "Smile"));
+            new String[] {":-)", ":)"}, "Smile"));
 
         defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY12",
             new String[] {"(blush)"}, "Blushing"));
@@ -97,6 +97,9 @@ public static Collection<Smiley> getDefaultSmileyPack()
         defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY20",
             new String[] {"(oops)"}, "Oops"));
 
+        defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY21",
+            new String[] {";-)", ";)"}, "Wink"));
+
         defaultSmileyPack
             = Collections.unmodifiableCollection(defaultSmileyList);