empathy r1191 - in trunk: libempathy-gtk src

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Jul  3 16:09:27 2008
New Revision: 1191
URL: http://svn.gnome.org/viewvc/empathy?rev=1191&view=rev

Log:
Set an smiley icon for the "Insert smiley" menu item.


Modified:
   trunk/libempathy-gtk/empathy-chat.c
   trunk/src/empathy-chat-window.glade

Modified: trunk/libempathy-gtk/empathy-chat.c
==============================================================================
--- trunk/libempathy-gtk/empathy-chat.c	(original)
+++ trunk/libempathy-gtk/empathy-chat.c	Thu Jul  3 16:09:27 2008
@@ -956,7 +956,10 @@
 	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);
 

Modified: trunk/src/empathy-chat-window.glade
==============================================================================
--- trunk/src/empathy-chat-window.glade	(original)
+++ trunk/src/empathy-chat-window.glade	Thu Jul  3 16:09:27 2008
@@ -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>