[Xfce4-commits] <postler:master> Use 'face-smile-big' instead of 'face-grin'

[Christian Dywan]

Updating branch refs/heads/master
         to 94be2a7aa7b50dc41a412e28f844805b1a89a39d (commit)
       from 8ebb0bcc6944df371d81dfc0dd565fcc60d3706c (commit)

commit 94be2a7aa7b50dc41a412e28f844805b1a89a39d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Jun 26 21:45:13 2010 +0200

    Use 'face-smile-big' instead of 'face-grin'

 postler/postler-app.vala      |    4 ++--
 postler/postler-composer.vala |   10 +++++-----
 postler/postler-content.vala  |    3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/postler/postler-app.vala b/postler/postler-app.vala
index 8027081..1234c7c 100644
--- a/postler/postler-app.vala
+++ b/postler/postler-app.vala
@@ -13,7 +13,7 @@ namespace Postler {
     const string STOCK_ADDRESSBOOK = "stock_addressbook";
     const string STOCK_EMBLEM_DRAFT = "emblem-draft";
     const string STOCK_EMBLEM_IMPORTANT = "emblem-important";
-    const string STOCK_FACE_GRIN = "face-grin";
+    const string STOCK_FACE_SMILE_BIG = "face-smile-big";
     const string STOCK_FACE_SAD = "face-sad";
     const string STOCK_FACE_WINK = "face-wink";
     const string STOCK_FOLDER_SAVED_SEARCH = "folder-saved-search";
@@ -47,7 +47,7 @@ public class Postler.App : Unique.App {
         { STOCK_ADDRESSBOOK, N_("_Addressbook") },
         { STOCK_EMBLEM_DRAFT },
         { STOCK_EMBLEM_IMPORTANT },
-        { STOCK_FACE_GRIN },
+        { STOCK_FACE_SMILE_BIG },
         { STOCK_FACE_SAD },
         { STOCK_FACE_WINK },
         { STOCK_FOLDER_SAVED_SEARCH },
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index ad3072e..3b4deb1 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -40,7 +40,7 @@ public class Postler.Composer : Gtk.Window {
                 </menu>
                 <menu action="Edit">
                     <menuitem action="Quote"/>
-                    <menuitem action="InsertEmoticonGrin"/>
+                    <menuitem action="InsertEmoticonSmileBig"/>
                     <menuitem action="InsertEmoticonWink"/>
                     <menuitem action="InsertEmoticonSad"/>
                     <separator/>
@@ -59,7 +59,7 @@ public class Postler.Composer : Gtk.Window {
                 <toolitem action="Preferences"/>
                 <separator expand="true"/>
                 <toolitem action="Quote"/>
-                <toolitem action="InsertEmoticonGrin"/>
+                <toolitem action="InsertEmoticonSmileBig"/>
                 <toolitem action="InsertEmoticonWink"/>
                 <toolitem action="InsertEmoticonSad"/>
             </toolbar>
@@ -150,7 +150,7 @@ public class Postler.Composer : Gtk.Window {
     void action_insert_emoticon (Gtk.Action action) {
         unowned string name = action.name;
         string emoticon;
-        if (name.has_suffix ("Grin"))
+        if (name.has_suffix ("SmileBig"))
             emoticon = ":-D";
         else if (name.has_suffix ("Wink"))
             emoticon = ";-)";
@@ -178,9 +178,9 @@ public class Postler.Composer : Gtk.Window {
           N_("Configure the application preferences"), action_preferences },
         { "Quote", Gtk.STOCK_INDENT, N_("_Quote the selected text"), "",
           N_("Mark the selected text as a quote"), action_quote },
-        { "InsertEmoticonGrin", STOCK_FACE_GRIN, N_("Insert _Grinning Face"), "",
+        { "InsertEmoticonSmileBig", STOCK_FACE_SMILE_BIG, N_("Insert Big _Smile"), "",
           N_("Insert a grinning face"), action_insert_emoticon },
-        { "InsertEmoticonWink", STOCK_FACE_WINK, N_("Insert _Winking Face"), "",
+        { "InsertEmoticonWink", STOCK_FACE_WINK, N_("Insert _Winking"), "",
           N_("Insert a winking face"), action_insert_emoticon },
         { "InsertEmoticonSad", STOCK_FACE_SAD, N_("Insert _Sad Face"), "",
           N_("Insert a sad face"), action_insert_emoticon }
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 00898a6..be5ae5b 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -159,7 +159,7 @@ public class Postler.Content : WebKit.WebView {
     }
 
     const EmoticonMapping[] emoticons = {
-        { ":-D", "face-grin" },
+        { ":-D", "face-smile-big" },
         { ":-(", "face-sad" },
         { ":'-(", "face-crying" },
         { "O:-)", "face-angel" },
@@ -170,6 +170,7 @@ public class Postler.Content : WebKit.WebView {
         { ":-O", "face-surprise" },
         { "8-)", "face-glasses" },
         { ":-P", "face-monkey" },
+        { ":)", "face-smile" },
         { "xD", "face-smile-big" },
         { ";)", "face-wink" },
         { "^_^", "face-smile" },