diff options
32 files changed, 64 insertions, 31 deletions
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index c369177f6a..f3077ae42f 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -19,7 +19,9 @@ * Boston, MA 02111-1307, USA. */ -#include <gnome.h> +#include <string.h> +#include <gdk/gdkkeysyms.h> +#include <gtk/gtksignal.h> #include "e-text-event-processor-emacs-like.h" static void e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *card); diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index dbc909e2c7..7d1f0e68d2 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -21,7 +21,6 @@ #ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ #define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ -#include <gnome.h> #include <gal/util/e-text-event-processor.h> #ifdef __cplusplus diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index 772ae5c12b..edcaf9b05b 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#include <gnome.h> +#include <gtk/gtksignal.h> #include "e-text-event-processor.h" static void e_text_event_processor_init (ETextEventProcessor *card); diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index e11c6451cc..00785db757 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -21,7 +21,8 @@ #ifndef __E_TEXT_EVENT_PROCESSOR_H__ #define __E_TEXT_EVENT_PROCESSOR_H__ -#include <gnome.h> +#include <glib.h> +#include <gtk/gtkobject.h> #include <gal/util/e-text-event-processor-types.h> #ifdef __cplusplus diff --git a/e-util/e-util.h b/e-util/e-util.h index e1e6205583..b960434421 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -1,9 +1,10 @@ #ifndef _E_UTIL_H_ #define _E_UTIL_H_ +#include <sys/types.h> #include <glib.h> #include <gtk/gtktypeutils.h> -#include <sys/types.h> +#include <bonobo/bonobo-xobject.h> #ifdef __cplusplus extern "C" { diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index 4f13a616b4..95fcc86bb4 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -21,12 +21,13 @@ */ #include <config.h> -#include "gal/util/e-i18n.h" #include <locale.h> -#include <libgnome/libgnome.h> #include <math.h> +#include <string.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> +#include <libgnome/libgnome.h> +#include "gal/util/e-i18n.h" #include "e-xml-utils.h" xmlNode * diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index bdcd756f3b..3a4649411c 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -23,7 +23,8 @@ #ifndef __E_XML_UTILS__ #define __E_XML_UTILS__ -#include <gnome.h> +#include <libgnome/gnome-defs.h> +#include <glib.h> #include <gnome-xml/tree.h> BEGIN_GNOME_DECLS diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h index 402b0048c6..97a9989fb9 100644 --- a/widgets/misc/e-canvas-utils.h +++ b/widgets/misc/e-canvas-utils.h @@ -23,7 +23,7 @@ #ifndef __E_CANVAS_UTILS__ #define __E_CANVAS_UTILS__ -#include <gnome.h> +#include <libgnomeui/gnome-canvas.h> BEGIN_GNOME_DECLS diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 0b609f3e1c..90782f4d11 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -21,8 +21,9 @@ */ #include <config.h> -#include <gnome.h> #include <math.h> +#include <gdk/gdkkeysyms.h> +#include <gtk/gtksignal.h> #include "e-canvas-vbox.h" #include "e-canvas-utils.h" #include "e-canvas.h" diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index e7e9140c1e..1dfaf7a726 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -21,7 +21,8 @@ #ifndef __E_CANVAS_VBOX_H__ #define __E_CANVAS_VBOX_H__ -#include <gnome.h> +#include <gtk/gtktypeutils.h> +#include <libgnomeui/gnome-canvas.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index f5f6ed77a9..91fbca29b8 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ -#include <gnome.h> +#include <gtk/gtksignal.h> #include "e-canvas.h" static void e_canvas_init (ECanvas *card); diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index c143d74fe2..6ed13d97d9 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -21,7 +21,8 @@ #ifndef __E_CANVAS_H__ #define __E_CANVAS_H__ -#include <gnome.h> +#include <glib.h> +#include <libgnomeui/gnome-canvas.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c index c7a79003ae..2325d659e4 100644 --- a/widgets/misc/e-colors.c +++ b/widgets/misc/e-colors.c @@ -8,7 +8,7 @@ * before things are realized. */ #include <config.h> -#include <gnome.h> +#include <gtk/gtkwidget.h> #include "e-colors.h" static gboolean e_color_inited; diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 590a89995c..6cfceb664c 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -1,6 +1,10 @@ #ifndef GNOME_APP_LIBS_COLOR_H #define GNOME_APP_LIBS_COLOR_H +#include <glib.h> +#include <gdk/gdk.h> +#include <libgnome/gnome-defs.h> + BEGIN_GNOME_DECLS void e_color_init (void); diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c index c10e0e6490..4049fbf315 100644 --- a/widgets/misc/e-cursors.c +++ b/widgets/misc/e-cursors.c @@ -5,7 +5,6 @@ * Miguel de Icaza (miguel@gnu.org) */ #include <config.h> -#include <gnome.h> #include "e-colors.h" #include "e-cursors.h" #include "pixmaps/cursor_cross.xpm" diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index 9019ae18c5..aef2f6191b 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -9,10 +9,10 @@ * (C) 2000 Helix Code, Inc. */ #include <config.h> +#include <gtk/gtkentry.h> #include <gtk/gtksignal.h> #include <libgnomeui/gnome-messagebox.h> #include <libgnomeui/gnome-stock.h> -#include <gnome.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gnome-canvas-pixbuf.h> #include "e-gui-utils.h" diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index fdd5d6a509..4e2ff17378 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -10,7 +10,13 @@ nnn * * (C) 2000 Helix Code, Inc. */ #include <config.h> -#include <gnome.h> +#include <gdk/gdkkeysyms.h> +#include <gtk/gtkaccellabel.h> +#include <gtk/gtklabel.h> +#include <gtk/gtkmenuitem.h> +#include <gtk/gtksignal.h> +#include <libgnomeui/gtkpixmapmenuitem.h> +#include <libgnomeui/gnome-stock.h> #include "e-popup-menu.h" #include "e-gui-utils.h" #include "gal/util/e-i18n.h" diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 61839902f6..5105424a6a 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -2,7 +2,9 @@ #ifndef E_POPUP_MENU_H #define E_POPUP_MENU_H +#include <gtk/gtkmenu.h> #include <gtk/gtkwidget.h> +#include <libgnome/gnome-defs.h> BEGIN_GNOME_DECLS diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index 3fb664cea4..d67d501019 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -21,12 +21,12 @@ */ #include <config.h> -#include <gnome.h> #include <math.h> +#include <gdk/gdkkeysyms.h> #include "e-reflow.h" -#include "gal/e-text/e-text.h" #include "e-canvas-utils.h" #include "e-canvas.h" +#include "gal/e-text/e-text.h" #include "gal/util/e-util.h" static void e_reflow_init (EReflow *reflow); diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index b4c1dcb372..205bdb042c 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -21,7 +21,8 @@ #ifndef __E_REFLOW_H__ #define __E_REFLOW_H__ -#include <gnome.h> +#include <glib.h> +#include <libgnomeui/gnome-canvas.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 49b42f1b19..eafd323abd 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -8,10 +8,10 @@ * (C) 2000, 2001 Ximian, Inc. */ #include <config.h> +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> #include "e-selection-model.h" #include "gal/util/e-util.h" -#include <gdk/gdkkeysyms.h> #define ESM_CLASS(e) ((ESelectionModelClass *)((GtkObject *)e)->klass) diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index 37a56471c9..4d78d17788 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -17,6 +17,7 @@ #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> +#include <gtk/gtkmenuitem.h> #include "e-unicode.h" #include "e-font.h" diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h index 14569ced7f..db12ef72ec 100644 --- a/widgets/misc/e-unicode.h +++ b/widgets/misc/e-unicode.h @@ -13,8 +13,10 @@ #include <sys/types.h> #include <glib.h> -#include <gtk/gtk.h> -#include <config.h> +#include <gtk/gtkclist.h> +#include <gtk/gtkentry.h> +#include <gtk/gtkmenu.h> +#include <gtk/gtkwidget.h> #include <libgnome/gnome-defs.h> BEGIN_GNOME_DECLS diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index 5dc5d13fe9..4ab21be725 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -38,9 +38,10 @@ #include <alloca.h> #endif #include <stdio.h> -#include <libgnomeui/gnome-canvas.h> +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> #include <gnome-xml/parser.h> +#include <libgnomeui/gnome-canvas.h> #include "gal/util/e-util.h" #include "gal/widgets/e-canvas.h" #include "gal/widgets/e-canvas-utils.h" diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c index 7320c48e36..daf0456110 100644 --- a/widgets/text/e-table-text-model.c +++ b/widgets/text/e-table-text-model.c @@ -18,6 +18,7 @@ #include <config.h> #include <ctype.h> +#include <gtk/gtksignal.h> #include "e-table-text-model.h" static void e_table_text_model_class_init (ETableTextModelClass *class); diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h index 5cf0b8a231..8f3694843f 100644 --- a/widgets/text/e-table-text-model.h +++ b/widgets/text/e-table-text-model.h @@ -19,7 +19,6 @@ #ifndef E_TABLE_TEXT_MODEL_H #define E_TABLE_TEXT_MODEL_H -#include <gnome.h> #include <gal/e-text/e-text-model.h> #include <gal/e-table/e-table-model.h> diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c index 55b293016f..72deddc2d9 100644 --- a/widgets/text/e-text-model-uri.c +++ b/widgets/text/e-text-model-uri.c @@ -11,6 +11,8 @@ #include <ctype.h> #include <sys/types.h> #include <regex.h> +#include <gtk/gtkmain.h> +#include <libgnome/gnome-url.h> #include "e-text-model-uri.h" static void e_text_model_uri_class_init (ETextModelURIClass *class); diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h index d070e34f53..9743935529 100644 --- a/widgets/text/e-text-model-uri.h +++ b/widgets/text/e-text-model-uri.h @@ -10,7 +10,6 @@ #ifndef E_TEXT_MODEL_URI_H #define E_TEXT_MODEL_URI_H -#include <gnome.h> #include <gal/e-text/e-text-model.h> BEGIN_GNOME_DECLS diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 29c6ffb6b1..4fec8724d8 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -20,6 +20,8 @@ #include <config.h> #include <ctype.h> +#include <string.h> +#include <gtk/gtksignal.h> #include "e-text-model-repos.h" #include "e-text-model.h" diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index afd9b79960..b697ca8396 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -20,8 +20,9 @@ #ifndef E_TEXT_MODEL_H #define E_TEXT_MODEL_H -#include <gnome.h> - +#include <glib.h> +#include <gtk/gtkobject.h> +#include <libgnome/gnome-defs.h> BEGIN_GNOME_DECLS diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 121100d37f..9bfc504459 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -20,9 +20,14 @@ #include <config.h> #include <math.h> #include <ctype.h> -#include <gdk/gdkx.h> /* for BlackPixel */ #include <unicode.h> +#include <string.h> +#include <gdk/gdkx.h> /* for BlackPixel */ #include <gtk/gtkinvisible.h> +#include <gtk/gtkmain.h> +#include <gtk/gtkselection.h> +#include <gtk/gtkwindow.h> +#include <libgnomeui/gnome-canvas-rect-ellipse.h> #include "e-text.h" #include "gal/widgets/e-canvas.h" #include "gal/widgets/e-canvas-utils.h" diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index eae84af102..0c33b448f3 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -20,11 +20,11 @@ #ifndef E_TEXT_H #define E_TEXT_H -#include <gnome.h> +#include <gtk/gtkpacker.h> #include <gal/widgets/e-font.h> #include <gal/util/e-text-event-processor.h> #include <gal/e-text/e-text-model.h> - +#include <libgnomeui/gnome-canvas.h> BEGIN_GNOME_DECLS |