aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-chat.c5
-rw-r--r--src/empathy-chat-window.glade9
2 files changed, 12 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 4fa9a10dc..9de2c79f6 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -956,7 +956,10 @@ chat_input_populate_popup_cb (GtkTextView *view,
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
- item = gtk_menu_item_new_with_mnemonic (_("Insert Smiley"));
+ item = gtk_image_menu_item_new_with_mnemonic (_("Insert Smiley"));
+ image = gtk_image_new_from_icon_name ("face-smile",
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
diff --git a/src/empathy-chat-window.glade b/src/empathy-chat-window.glade
index e54072473..2b2e396d4 100644
--- a/src/empathy-chat-window.glade
+++ b/src/empathy-chat-window.glade
@@ -35,10 +35,17 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menu_conv_insert_smiley">
+ <widget class="GtkImageMenuItem" id="menu_conv_insert_smiley">
<property name="visible">True</property>
<property name="label" translatable="yes">Insert _Smiley</property>
<property name="use_underline">True</property>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image3">
+ <property name="visible">True</property>
+ <property name="icon_size">1</property>
+ <property name="icon_name">face-smile</property>
+ </widget>
+ </child>
</widget>
</child>
<child>