[evolution/webkit-composer-rebased: 44/105] Fix Insert->Emoticon->... action

[Matthew Barnes <mbarnes src gnome org>]

commit 66bfb4ee89c0fa393c3060f7a426eb8f9eb45661
Author: Dan VrÃtil <dvratil redhat com>
Date:   Wed Aug 15 13:21:09 2012 +0200

    Fix Insert->Emoticon->... action

 e-util/e-editor-actions.c        |    7 +++----
 e-util/e-editor-manager.ui       |    4 ++--
 e-util/e-emoticon-chooser-menu.c |   10 +++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/e-util/e-editor-actions.c b/e-util/e-editor-actions.c
index cee473c..cb216d0 100644
--- a/e-util/e-editor-actions.c
+++ b/e-util/e-editor-actions.c
@@ -448,12 +448,11 @@ action_insert_emoticon_cb (GtkAction *action,
 {
 	EEditorWidget *widget;
 	EEditorSelection *selection;
-	EEmoticonChooser *chooser;
 	EEmoticon *emoticon;
 	gchar *uri = NULL;
 
-	chooser = E_EMOTICON_CHOOSER (action);
-	emoticon = e_emoticon_chooser_get_current_emoticon (chooser);
+	emoticon = e_emoticon_chooser_get_current_emoticon (
+					E_EMOTICON_CHOOSER (action));
 	g_return_if_fail (emoticon != NULL);
 
 	uri = e_emoticon_get_uri (emoticon);
@@ -1878,7 +1877,7 @@ editor_actions_init (EEditor *editor)
 
 	/* Face Action */
 	action = e_emoticon_action_new (
-		"insert-face", _("_Emoticon"),
+		"insert-emoticon", _("_Emoticon"),
 		_("Insert Emoticon"), NULL);
 	g_object_set (action, "icon-name", "face-smile", NULL);
 	g_signal_connect (
diff --git a/e-util/e-editor-manager.ui b/e-util/e-editor-manager.ui
index 1cd7db8..610b3ef 100644
--- a/e-util/e-editor-manager.ui
+++ b/e-util/e-editor-manager.ui
@@ -34,7 +34,7 @@
       <menuitem action='insert-table'/>
       <menuitem action='insert-text-file'/>
       <menuitem action='insert-html-file'/>
-      <menuitem action='insert-face'/>
+      <menuitem action='insert-emoticon'/>
     </menu>
     <placeholder name='pre-format-menu'/>
     <menu action='format-menu'>
@@ -124,7 +124,7 @@
     <toolitem action='insert-link'/>
     <toolitem action='insert-rule'/>
     <toolitem action='insert-table'/>
-    <toolitem action='insert-face'/>
+    <toolitem action='insert-emoticon'/>
   </toolbar>
   <popup name='context-menu'>
     <placeholder name='context-spell-suggest'/>
diff --git a/e-util/e-emoticon-chooser-menu.c b/e-util/e-emoticon-chooser-menu.c
index 7bf6184..91cc756 100644
--- a/e-util/e-emoticon-chooser-menu.c
+++ b/e-util/e-emoticon-chooser-menu.c
@@ -136,20 +136,20 @@ emoticon_chooser_menu_init (EEmoticonChooserMenu *chooser_menu)
 	list = e_emoticon_chooser_get_items ();
 
 	for (iter = list; iter != NULL; iter = iter->next) {
-		EEmoticon *face = iter->data;
+		EEmoticon *emoticon = iter->data;
 		GtkWidget *item;
 
 		/* To keep translated strings in subclasses */
-		item = gtk_image_menu_item_new_with_mnemonic (_(face->label));
+		item = gtk_image_menu_item_new_with_mnemonic (_(emoticon->label));
 		gtk_image_menu_item_set_image (
 			GTK_IMAGE_MENU_ITEM (item),
 			gtk_image_new_from_icon_name (
-			face->icon_name, GTK_ICON_SIZE_MENU));
+			emoticon->icon_name, GTK_ICON_SIZE_MENU));
 		gtk_widget_show (item);
 
 		g_object_set_data_full (
-			G_OBJECT (item), "face",
-			e_emoticon_copy (face),
+			G_OBJECT (item), "emoticon",
+			e_emoticon_copy (emoticon),
 			(GDestroyNotify) e_emoticon_free);
 
 		g_signal_connect_swapped (