[evolution/webkit: 97/134] Rebase and fix build issues

[Dan VrÃtil <dvratil src gnome org>]

commit 80fb58b82ec66a16b9ea52cf745c303d1647117b
Merge: 9c47eaa c1fe7a1
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Oct 7 19:09:17 2011 +0200

    Rebase and fix build issues

 mail/em-format-html-display.c |    2 +-
 widgets/misc/Makefile.am      |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --cc mail/em-format-html-display.c
index 3c98b67,9038744..940800c
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@@ -495,7 -493,7 +495,7 @@@ efhd_parse_attachment (EMFormat *emf
  	if (emf->folder && emf->folder->summary && emf->message_uid) {
  		CamelMessageInfo *mi;
  
--		mi = camel_folder_summary_uid (emf->folder->summary, emf->message_uid);
++		mi = camel_folder_summary_get (emf->folder->summary, emf->message_uid);
  		if (mi) {
  			const CamelMessageContentInfo *ci;
  
diff --cc widgets/misc/Makefile.am
index cea2d4b,d98fa4c..9d47662
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@@ -85,6 -86,6 +85,7 @@@ libemiscwidgets_la_CPPFLAGS =						
  	$(GNOME_PLATFORM_CFLAGS)					\
  	$(CHAMPLAIN_CFLAGS)						\
  	$(GEOCLUE_CFLAGS)						\
++	$(GTKHTML_CFLAGS)						\
  	$(CLUTTER_CFLAGS)
  
  libemiscwidgets_la_SOURCES =			\