ekiga r6633 - in trunk: . lib/engine/gui/gtk-frontend

[dsandras svn gnome org]

Author: dsandras
Date: Sun Aug 17 18:52:46 2008
New Revision: 6633
URL: http://svn.gnome.org/viewvc/ekiga?rev=6633&view=rev

Log:
Added patch from Fabrice Alphonso to fix smiley icon.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/gui/gtk-frontend/chat-area.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/chat-area.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	Sun Aug 17 18:52:46 2008
@@ -47,6 +47,7 @@
 #include <string.h>
 #include <stdarg.h>
 
+
 class ChatAreaHelper;
 
 struct _ChatAreaPrivate
@@ -624,6 +625,7 @@
   GdkPixbuf* pixbuf = NULL;
   GtkWidget* image = NULL;
   GtkWidget* smiley_item = NULL;
+  GtkWidget* smiley_button = NULL;
 
   /* we need to build a nice menu for smileys */
   self->priv->smiley_menu = gtk_menu_new ();
@@ -661,7 +663,9 @@
 		      FALSE, TRUE, 2);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_INFO); // FIXME
+  button = gtk_button_new_with_mnemonic (_("_Smile..."));
+  smiley_button = gtk_image_new_from_icon_name ("face-smile", GTK_ICON_SIZE_BUTTON);
+  gtk_button_set_image (GTK_BUTTON(button), smiley_button);
   gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
   g_signal_connect (G_OBJECT (button), "clicked",
 		    G_CALLBACK (on_smiley_clicked), self);