From 54b80a7271e8ce1b2f3ccc68bb553940a24b80e2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 17 Oct 2008 03:48:03 +0000 Subject: Get the mail folder tree compiling, though I'm not yet sure why it's not showing anything. Probably something stupid. Also enabled the composer. svn path=/branches/kill-bonobo/; revision=36623 --- mail/em-format-html-display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mail/em-format-html-display.c') diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 90e6acb54e..20f86ca562 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -80,7 +80,6 @@ #include "mail-config.h" #include "em-format-html-display.h" -#include "em-marshal.h" #include "e-searching-tokenizer.h" #include "em-icon-stream.h" #include "em-utils.h" @@ -337,7 +336,7 @@ efhd_class_init(GObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(EMFormatHTMLDisplayClass, popup_event), efhd_bool_accumulator, NULL, - em_marshal_BOOLEAN__BOXED_POINTER_POINTER, + e_marshal_BOOLEAN__BOXED_POINTER_POINTER, G_TYPE_BOOLEAN, 3, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE, G_TYPE_POINTER, G_TYPE_POINTER); @@ -621,8 +620,10 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd) p->search_entry = e_icon_entry_get_entry (E_ICON_ENTRY (icon_entry)); gtk_label_set_mnemonic_widget (GTK_LABEL (label1), p->search_entry); gtk_widget_show (p->search_entry); +#if 0 /* KILL-BONOBO */ clear_button = e_icon_entry_create_button ("gtk-clear"); e_icon_entry_pack_widget (E_ICON_ENTRY (icon_entry), clear_button, FALSE); +#endif gtk_widget_show_all (icon_entry); gtk_widget_hide (clear_button); -- cgit v1.2.3