aboutsummaryrefslogtreecommitdiffstats
path: root/shell/importer
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-11-08 06:04:53 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-11-08 06:04:53 +0800
commitd6445f8abfa78c0a9c8680a3ba7422d331391f8f (patch)
tree8d462e7747bccdc2108837401fd295dfa160943d /shell/importer
parent6140798719beb44abaa4de89043f6d911c977621 (diff)
downloadgsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar
gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar.gz
gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar.bz2
gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar.lz
gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar.xz
gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.tar.zst
gsoc2013-evolution-d6445f8abfa78c0a9c8680a3ba7422d331391f8f.zip
Merge revisions 36685:36729 from trunk.
svn path=/branches/kill-bonobo/; revision=36763
Diffstat (limited to 'shell/importer')
-rw-r--r--shell/importer/evolution-importer-client.h2
-rw-r--r--shell/importer/intelligent.c20
2 files changed, 2 insertions, 20 deletions
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 043a639c5d..35cde858d6 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -24,7 +24,7 @@
#define EVOLUTION_IMPORTER_CLIENT_H
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <importer/evolution-importer.h>
#include <importer/evolution-importer-listener.h>
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index a9a8fed024..c7cb6b3b0c 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -26,25 +26,7 @@
#include "intelligent.h"
-#include <glib.h>
-
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include <libgnome/gnome-config.h>
/*#include <libgnome/gnome-util.h>*/