aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-display.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-display.c')
-rw-r--r--mail/mail-display.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/mail/mail-display.c b/mail/mail-display.c
index dcd9729f5f..5a405abdf2 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -8,37 +8,41 @@
*
* (C) 2000 Helix Code, Inc.
*/
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <sys/stat.h>
#include <ctype.h>
#include <fcntl.h>
#include <errno.h>
-#include <gnome.h>
-#include "e-util/e-html-utils.h"
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-popup-menu.h>
-#include "mail-display.h"
-#include "mail-config.h"
-#include "mail.h"
-#include "art/empty.xpm"
-
-#include "mail-ops.h"
-#include "mail-mt.h"
-
-#include <bonobo.h>
#include <libgnorba/gnorba.h>
-#include <bonobo/bonobo-stream-memory.h>
#include <libgnomevfs/gnome-vfs-mime-info.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-
+#include <bonobo/bonobo-control-frame.h>
+#include <bonobo/bonobo-stream-memory.h>
#include <bonobo/bonobo-ui-toolbar-icon.h>
+#include <bonobo/bonobo-widget.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixbuf-loader.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-popup-menu.h>
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/htmlengine.h> /* XXX */
-#include <gtkhtml/htmlobject.h> /* XXX */
-#include <gtkhtml/htmlinterval.h> /* XXX */
+#include <gtkhtml/htmlobject.h> /* XXX */
#include <gtkhtml/htmltext.h> /* XXX */
+#include <gtkhtml/htmlinterval.h> /* XXX */
+
+#include <e-util/e-html-utils.h>
+
+#include "mail-display.h"
+#include "mail-config.h"
+#include "mail.h"
+#include "art/empty.xpm"
+
+#include "mail-ops.h"
+#include "mail-mt.h"
#define PARENT_TYPE (gtk_vbox_get_type ())