empathy r1819 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:19:00 2008
New Revision: 1819
URL: http://svn.gnome.org/viewvc/empathy?rev=1819&view=rev

Log:
Moved gtk_window_set_icon name into the glade. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy-gtk/empathy-ft-manager.c
   trunk/libempathy-gtk/empathy-ft-manager.glade

Modified: trunk/libempathy-gtk/empathy-ft-manager.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ft-manager.c	(original)
+++ trunk/libempathy-gtk/empathy-ft-manager.c	Fri Nov 21 16:19:00 2008
@@ -1055,8 +1055,6 @@
   g_signal_connect (ft_manager->priv->window, "configure-event",
       G_CALLBACK (ft_manager_configure_event_cb), ft_manager);
 
-  gtk_window_set_icon_name (GTK_WINDOW (ft_manager->priv->window), EMPATHY_IMAGE_DOCUMENT_SEND);
-
   /* Window geometry. */
   empathy_geometry_load ("ft-manager", &x, &y, &w, &h);
 

Modified: trunk/libempathy-gtk/empathy-ft-manager.glade
==============================================================================
--- trunk/libempathy-gtk/empathy-ft-manager.glade	(original)
+++ trunk/libempathy-gtk/empathy-ft-manager.glade	Fri Nov 21 16:19:00 2008
@@ -8,6 +8,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">File transfers</property>
     <property name="role">empathy-ft-manager</property>
+    <property name="icon">document-send</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">