diff options
| -rw-r--r-- | mail/ChangeLog | 1 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 16 | ||||
| -rw-r--r-- | ui/evolution-mail.xml | 18 |
3 files changed, 18 insertions, 17 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 diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml index 99aacf929b..116a1ea83a 100644 --- a/ui/evolution-mail.xml +++ b/ui/evolution-mail.xml @@ -124,45 +124,45 @@ <toolitem name="MailGet" verb="" _label="Get Mail" _descr="Send queued mail and retrieve new mail" - pixtype="stock" pixname="Receive Mail"/> + pixtype="pixbuf"/> <toolitem name="MailCompose" verb="" _label="Compose" _descr="Compose a new message" - pixtype="stock" pixname="New Mail"/> + pixtype="pixbuf"/> <toolitem type="separator"/> <toolitem name="Reply" verb="MessageReplySndr" _label="Reply" _descr="Reply to the sender of this message" - pixtype="stock" pixname="Reply to Mail"/> + pixtype="pixbuf"/> <toolitem name="ReplyAll" verb="MessageReplyAll" _label="Reply to All" _descr="Reply to all recipients of this message" - pixtype="stock" pixname="Reply to Mail"/> + pixtype="pixbuf"/> <toolitem name="Forward" verb="MessageForward" _label="Forward" _descr="Forward this message" - pixtype="stock" pixname="Forward Mail"/> + pixtype="pixbuf"/> <toolitem type="separator"/> <toolitem name="Move" verb="MessageMove" _label="Move" _descr="Move message to a new folder" - pixtype="stock" pixname="Send Mail"/> + pixtype="pixbuf"/> <toolitem name="Copy" verb="MessageCopy" _label="Copy" _descr="Copy message to a new folder" - pixtype="stock" pixname="Send Mail"/> + pixtype="pixbuf"/> <toolitem type="separator"/> <toolitem name="Print" verb="MessagePrint" _label="Print" _descr="Print the selected message" - pixtype="stock" pixname="Print"/> + pixtype="pixbuf"/> <toolitem name="Delete" verb="MessageDelete" _label="Delete" _descr="Delete this message" - pixtype="stock" pixname="Trash"/> + pixtype="pixbuf"/> </dockitem> </Root>
\ No newline at end of file |