aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-11-22 00:19:00 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:19:00 +0800
commitfff4d9e45b71904037d77500c7baa3e92435959a (patch)
treeb8448499bc8296548b96e01082ba7de563f68829
parent07e4fa7ed07dbe6fe6b9591849be7531aada5683 (diff)
downloadgsoc2013-empathy-fff4d9e45b71904037d77500c7baa3e92435959a.tar
gsoc2013-empathy-fff4d9e45b71904037d77500c7baa3e92435959a.tar.gz
gsoc2013-empathy-fff4d9e45b71904037d77500c7baa3e92435959a.tar.bz2
gsoc2013-empathy-fff4d9e45b71904037d77500c7baa3e92435959a.tar.lz
gsoc2013-empathy-fff4d9e45b71904037d77500c7baa3e92435959a.tar.xz
gsoc2013-empathy-fff4d9e45b71904037d77500c7baa3e92435959a.tar.zst
gsoc2013-empathy-fff4d9e45b71904037d77500c7baa3e92435959a.zip
Moved gtk_window_set_icon name into the glade. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1819
-rw-r--r--libempathy-gtk/empathy-ft-manager.c2
-rw-r--r--libempathy-gtk/empathy-ft-manager.glade1
2 files changed, 1 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-ft-manager.c b/libempathy-gtk/empathy-ft-manager.c
index 3553a16eb..85aa4b7c2 100644
--- a/libempathy-gtk/empathy-ft-manager.c
+++ b/libempathy-gtk/empathy-ft-manager.c
@@ -1055,8 +1055,6 @@ ft_manager_build_ui (EmpathyFTManager *ft_manager)
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);
diff --git a/libempathy-gtk/empathy-ft-manager.glade b/libempathy-gtk/empathy-ft-manager.glade
index d1cf28f2c..388395230 100644
--- a/libempathy-gtk/empathy-ft-manager.glade
+++ b/libempathy-gtk/empathy-ft-manager.glade
@@ -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">