aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMichael Meeks <mmeeks@src.gnome.org>2000-09-14 21:51:55 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-09-14 21:51:55 +0800
commita005cabc942b4cede3ff02f8f22f779e800f668e (patch)
tree9d66c264d8f4d7f76f793ff2ed32d52be6372ba2 /mail
parent0a59703a630f653eb0798b126c79ea039a64c144 (diff)
downloadgsoc2013-evolution-a005cabc942b4cede3ff02f8f22f779e800f668e.tar
gsoc2013-evolution-a005cabc942b4cede3ff02f8f22f779e800f668e.tar.gz
gsoc2013-evolution-a005cabc942b4cede3ff02f8f22f779e800f668e.tar.bz2
gsoc2013-evolution-a005cabc942b4cede3ff02f8f22f779e800f668e.tar.lz
gsoc2013-evolution-a005cabc942b4cede3ff02f8f22f779e800f668e.tar.xz
gsoc2013-evolution-a005cabc942b4cede3ff02f8f22f779e800f668e.tar.zst
gsoc2013-evolution-a005cabc942b4cede3ff02f8f22f779e800f668e.zip
Make Tigert's icons work again.
svn path=/trunk/; revision=5427
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog1
-rw-r--r--mail/folder-browser-factory.c16
2 files changed, 9 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ea1650e339..8a47dda4a9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,6 +1,7 @@
2000-09-14 Michael Meeks <michael@helixcode.com>
* folder-browser-factory.c: move fn to bonobo.
+ (set_pixmap): update.
2000-09-14 Christopher James Lahey <clahey@helixcode.com>
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index f9010d8370..22d1166b82 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -122,21 +122,21 @@ set_pixmap (Bonobo_UIContainer container,
const char *xml_path,
const char *icon)
{
-/*
- * FIXME: this is broken, and needs fixing
- * we probably want just to pass a filename in as filename
- * and not to have the mess with gnome_pixmap_file as well.
- */
-/* char *path, *parent_path;
+ char *path, *parent_path;
xmlNode *node;
+ GdkPixbuf *pixbuf;
path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
+ pixbuf = gdk_pixbuf_new_from_file (path);
+ g_return_if_fail (pixbuf != NULL);
+
node = bonobo_ui_container_get_tree (container, xml_path, FALSE, NULL);
g_return_if_fail (node != NULL);
- bonobo_ui_util_xml_set_pix_fname (node, path);
+ bonobo_ui_util_xml_set_pixbuf (node, pixbuf);
+ gdk_pixbuf_unref (pixbuf);
parent_path = bonobo_ui_xml_get_parent_path (xml_path);
bonobo_ui_component_set_tree (NULL, container, parent_path, node, NULL);
@@ -144,7 +144,7 @@ set_pixmap (Bonobo_UIContainer container,
xmlFreeNode (node);
g_free (parent_path);
- g_free (path);*/
+ g_free (path);
}
static void