diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-08 06:04:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-08 06:04:53 +0800 |
| commit | d6445f8abfa78c0a9c8680a3ba7422d331391f8f (patch) | |
| tree | 8d462e7747bccdc2108837401fd295dfa160943d /shell | |
| parent | 6140798719beb44abaa4de89043f6d911c977621 (diff) | |
| download | gsoc2013-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')
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/importer/evolution-importer-client.h | 2 | ||||
| -rw-r--r-- | shell/importer/intelligent.c | 20 |
3 files changed, 9 insertions, 20 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4ea93c997e..4ba417f5d8 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-10-30 Matthew Barnes <mbarnes@redhat.com> + + * importer/evolution-importer-client.h: + * importer/intelligent.c: + * test/evolution-test-component.c: + Only include the toplevel GTK+ header. + 2008-10-17 Kandepu Prasad <kaprasad@novell.com> ** Fix for bug #311479 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>*/ |