GNOME.org
 

libgnomeui r5629 - in trunk: . libgnomeui test-gnome

Author: friemann
Date: Wed Jun 18 21:30:34 2008
New Revision: 5629
URL: http://svn.gnome.org/viewvc/libgnomeui?rev=5629&view=rev

Log:
2008-06-18  Felix Riemann  <friemann svn gnome org>

	* libgnomeui/*.c:
	* libgnomeui/*.h:
	* test-gnome/prop-editor.h:
	Fix Glib, Gdk and GTK+ single includes. Fixes bug #538984.


Modified:
   trunk/ChangeLog
   trunk/libgnomeui/gnome-about.c
   trunk/libgnomeui/gnome-about.h
   trunk/libgnomeui/gnome-app-helper.h
   trunk/libgnomeui/gnome-app.h
   trunk/libgnomeui/gnome-appbar.h
   trunk/libgnomeui/gnome-client.h
   trunk/libgnomeui/gnome-color-picker.c
   trunk/libgnomeui/gnome-color-picker.h
   trunk/libgnomeui/gnome-dateedit.h
   trunk/libgnomeui/gnome-dialog.h
   trunk/libgnomeui/gnome-druid-page-standard.c
   trunk/libgnomeui/gnome-entry.c
   trunk/libgnomeui/gnome-entry.h
   trunk/libgnomeui/gnome-file-entry.c
   trunk/libgnomeui/gnome-file-entry.h
   trunk/libgnomeui/gnome-font-picker.c
   trunk/libgnomeui/gnome-font-picker.h
   trunk/libgnomeui/gnome-href.h
   trunk/libgnomeui/gnome-icon-entry.c
   trunk/libgnomeui/gnome-icon-entry.h
   trunk/libgnomeui/gnome-icon-item.c
   trunk/libgnomeui/gnome-icon-item.h
   trunk/libgnomeui/gnome-icon-lookup.h
   trunk/libgnomeui/gnome-icon-theme.h
   trunk/libgnomeui/gnome-password-dialog.c
   trunk/libgnomeui/gnome-password-dialog.h
   trunk/libgnomeui/gnome-pixmap-entry.c
   trunk/libgnomeui/gnome-pixmap-entry.h
   trunk/libgnomeui/gnome-pixmap.h
   trunk/libgnomeui/gnome-popup-menu.h
   trunk/libgnomeui/gnome-stock-icons.h
   trunk/libgnomeui/gnome-thumbnail.c
   trunk/libgnomeui/gnome-ui-init.c
   trunk/libgnomeui/gnome-window-icon.c
   trunk/libgnomeui/gnome-window-icon.h
   trunk/libgnomeui/gnome-window.c
   trunk/libgnomeui/gnome-window.h
   trunk/libgnomeui/gnometypes.c
   trunk/libgnomeui/libgnomeui-access.c
   trunk/libgnomeui/libgnomeui-access.h
   trunk/libgnomeui/libgnomeuiP.h
   trunk/test-gnome/prop-editor.h

Modified: trunk/libgnomeui/gnome-about.c
==============================================================================
--- trunk/libgnomeui/gnome-about.c	(original)
+++ trunk/libgnomeui/gnome-about.c	Wed Jun 18 21:30:34 2008
@@ -29,19 +29,7 @@
 
 #include "gnome-stock-icons.h"
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkviewport.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 
 #include "libgnomeuiP.h"

Modified: trunk/libgnomeui/gnome-about.h
==============================================================================
--- trunk/libgnomeui/gnome-about.h	(original)
+++ trunk/libgnomeui/gnome-about.h	Wed Jun 18 21:30:34 2008
@@ -27,7 +27,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-app-helper.h
==============================================================================
--- trunk/libgnomeui/gnome-app-helper.h	(original)
+++ trunk/libgnomeui/gnome-app-helper.h	Wed Jun 18 21:30:34 2008
@@ -38,7 +38,7 @@
 #ifndef GNOME_APP_HELPER_H
 #define GNOME_APP_HELPER_H
 
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 
 #include <libgnomeui/gnome-appbar.h>
 #include <libgnomeui/gnome-app.h>

Modified: trunk/libgnomeui/gnome-app.h
==============================================================================
--- trunk/libgnomeui/gnome-app.h	(original)
+++ trunk/libgnomeui/gnome-app.h	Wed Jun 18 21:30:34 2008
@@ -37,9 +37,7 @@
 #ifndef GNOME_APP_H
 #define GNOME_APP_H
 
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include <bonobo/bonobo-dock.h>
 

Modified: trunk/libgnomeui/gnome-appbar.h
==============================================================================
--- trunk/libgnomeui/gnome-appbar.h	(original)
+++ trunk/libgnomeui/gnome-appbar.h	Wed Jun 18 21:30:34 2008
@@ -28,9 +28,7 @@
 #ifndef __GNOME_APPBAR_H__
 #define __GNOME_APPBAR_H__
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkprogressbar.h>
-
+#include <gtk/gtk.h>
 
 #include "gnome-types.h"
 

Modified: trunk/libgnomeui/gnome-client.h
==============================================================================
--- trunk/libgnomeui/gnome-client.h	(original)
+++ trunk/libgnomeui/gnome-client.h	Wed Jun 18 21:30:34 2008
@@ -28,8 +28,7 @@
 
 #include <unistd.h>
 #include <sys/types.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-program.h>
 

Modified: trunk/libgnomeui/gnome-color-picker.c
==============================================================================
--- trunk/libgnomeui/gnome-color-picker.c	(original)
+++ trunk/libgnomeui/gnome-color-picker.c	Wed Jun 18 21:30:34 2008
@@ -30,14 +30,7 @@
 #include <config.h>
 #include <libgnome/gnome-macros.h>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 /* Must be before all other gnome includes!! */
 #include <glib/gi18n-lib.h>
@@ -45,7 +38,6 @@
 #include "gnome-marshal.h"
 #include "gnome-color-picker.h"
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbutton.h>
 
 #include <libgnomeuiP.h>
 

Modified: trunk/libgnomeui/gnome-color-picker.h
==============================================================================
--- trunk/libgnomeui/gnome-color-picker.h	(original)
+++ trunk/libgnomeui/gnome-color-picker.h	Wed Jun 18 21:30:34 2008
@@ -32,7 +32,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS

Modified: trunk/libgnomeui/gnome-dateedit.h
==============================================================================
--- trunk/libgnomeui/gnome-dateedit.h	(original)
+++ trunk/libgnomeui/gnome-dateedit.h	Wed Jun 18 21:30:34 2008
@@ -27,7 +27,7 @@
 #define __GNOME_DATE_EDIT_H_ 
 
 #include <time.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
  
 G_BEGIN_DECLS

Modified: trunk/libgnomeui/gnome-dialog.h
==============================================================================
--- trunk/libgnomeui/gnome-dialog.h	(original)
+++ trunk/libgnomeui/gnome-dialog.h	Wed Jun 18 21:30:34 2008
@@ -26,10 +26,7 @@
 #ifndef GNOME_DISABLE_DEPRECATED
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <stdarg.h>
 

Modified: trunk/libgnomeui/gnome-druid-page-standard.c
==============================================================================
--- trunk/libgnomeui/gnome-druid-page-standard.c	(original)
+++ trunk/libgnomeui/gnome-druid-page-standard.c	Wed Jun 18 21:30:34 2008
@@ -29,13 +29,7 @@
 #include "gnome-druid.h"
 #include "gnome-uidefs.h"
 
-/* FIXME: Are these includes needed */
-#include <gtk/gtklabel.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include "gnome-druid-page-standard.h"
 

Modified: trunk/libgnomeui/gnome-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-entry.c	(original)
+++ trunk/libgnomeui/gnome-entry.c	Wed Jun 18 21:30:34 2008
@@ -36,10 +36,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklist.h>
-#include <gtk/gtklistitem.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 #include <gconf/gconf-client.h>
 #include <libgnome/gnome-program.h>

Modified: trunk/libgnomeui/gnome-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-entry.h	(original)
+++ trunk/libgnomeui/gnome-entry.h	Wed Jun 18 21:30:34 2008
@@ -35,8 +35,7 @@
 #ifndef GNOME_DISABLE_DEPRECATED
 
 #include <glib.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkeditable.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-file-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-file-entry.c	(original)
+++ trunk/libgnomeui/gnome-file-entry.c	Wed Jun 18 21:30:34 2008
@@ -45,15 +45,7 @@
 #include <libgnome/gnome-macros.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 /* Must be before all other gnome includes!! */
 #include <glib/gi18n-lib.h>

Modified: trunk/libgnomeui/gnome-file-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-file-entry.h	(original)
+++ trunk/libgnomeui/gnome-file-entry.h	Wed Jun 18 21:30:34 2008
@@ -36,7 +36,7 @@
 
 
 #include <libgnomeui/gnome-entry.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #ifndef GNOME_DISABLE_DEPRECATED
 

Modified: trunk/libgnomeui/gnome-font-picker.c
==============================================================================
--- trunk/libgnomeui/gnome-font-picker.c	(original)
+++ trunk/libgnomeui/gnome-font-picker.c	Wed Jun 18 21:30:34 2008
@@ -25,15 +25,7 @@
 /* Must be before all other gnome includes!! */
 #include <glib/gi18n-lib.h>
 
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkfontsel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "gnome-stock-icons.h"
 #include "gnometypebuiltins.h"

Modified: trunk/libgnomeui/gnome-font-picker.h
==============================================================================
--- trunk/libgnomeui/gnome-font-picker.h	(original)
+++ trunk/libgnomeui/gnome-font-picker.h	Wed Jun 18 21:30:34 2008
@@ -23,7 +23,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-href.h
==============================================================================
--- trunk/libgnomeui/gnome-href.h	(original)
+++ trunk/libgnomeui/gnome-href.h	Wed Jun 18 21:30:34 2008
@@ -26,7 +26,7 @@
 #ifndef GNOME_DISABLE_DEPRECATED
 
 #include <glib.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 
 G_BEGIN_DECLS

Modified: trunk/libgnomeui/gnome-icon-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-icon-entry.c	(original)
+++ trunk/libgnomeui/gnome-icon-entry.c	Wed Jun 18 21:30:34 2008
@@ -39,17 +39,7 @@
 
 #include <unistd.h> /*getcwd*/
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 /* Must be before all other gnome includes!! */
 #include <glib/gi18n-lib.h>

Modified: trunk/libgnomeui/gnome-icon-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-entry.h	(original)
+++ trunk/libgnomeui/gnome-icon-entry.h	Wed Jun 18 21:30:34 2008
@@ -38,8 +38,8 @@
 #define GNOME_ICON_ENTRY_H
 
 
-#include <glib/gmacros.h>
-#include <gtk/gtkvbox.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-file-entry.h>
 
 

Modified: trunk/libgnomeui/gnome-icon-item.c
==============================================================================
--- trunk/libgnomeui/gnome-icon-item.c	(original)
+++ trunk/libgnomeui/gnome-icon-item.c	Wed Jun 18 21:30:34 2008
@@ -28,11 +28,9 @@
 #include <config.h>
 #include <math.h>
 #include <libgnome/gnome-macros.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkrgb.h>
+#include <gdk/gdk.h>
 #include <libart_lgpl/art_rgb_affine.h>
 #include <libart_lgpl/art_rgb_rgba_affine.h>
 #include <string.h>

Modified: trunk/libgnomeui/gnome-icon-item.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-item.h	(original)
+++ trunk/libgnomeui/gnome-icon-item.h	Wed Jun 18 21:30:34 2008
@@ -31,8 +31,7 @@
 #ifndef GNOME_DISABLE_DEPRECATED
 
 #include <libgnomecanvas/gnome-canvas.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-icon-lookup.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-lookup.h	(original)
+++ trunk/libgnomeui/gnome-icon-lookup.h	Wed Jun 18 21:30:34 2008
@@ -23,7 +23,7 @@
 #ifndef GNOME_ICON_LOOKUP_H
 #define GNOME_ICON_LOOKUP_H
 
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomeui/gnome-thumbnail.h>
 /* We used to include this, so keep doing it for backwards compat */

Modified: trunk/libgnomeui/gnome-icon-theme.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-theme.h	(original)
+++ trunk/libgnomeui/gnome-icon-theme.h	Wed Jun 18 21:30:34 2008
@@ -23,7 +23,7 @@
 #ifndef GNOME_DISABLE_DEPRECATED
 
 #include <glib-object.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-password-dialog.c
==============================================================================
--- trunk/libgnomeui/gnome-password-dialog.c	(original)
+++ trunk/libgnomeui/gnome-password-dialog.c	Wed Jun 18 21:30:34 2008
@@ -31,21 +31,7 @@
 #include "gnometypebuiltins.h"
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>
 
 #define GNOME_PASSWORD_DIALOG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GNOME_TYPE_PASSWORD_DIALOG, GnomePasswordDialogDetails))
 #define PARAM_STATIC G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB

Modified: trunk/libgnomeui/gnome-password-dialog.h
==============================================================================
--- trunk/libgnomeui/gnome-password-dialog.h	(original)
+++ trunk/libgnomeui/gnome-password-dialog.h	Wed Jun 18 21:30:34 2008
@@ -25,7 +25,7 @@
 #ifndef GNOME_PASSWORD_DIALOG_H
 #define GNOME_PASSWORD_DIALOG_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-pixmap-entry.c
==============================================================================
--- trunk/libgnomeui/gnome-pixmap-entry.c	(original)
+++ trunk/libgnomeui/gnome-pixmap-entry.c	Wed Jun 18 21:30:34 2008
@@ -36,18 +36,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: trunk/libgnomeui/gnome-pixmap-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-pixmap-entry.h	(original)
+++ trunk/libgnomeui/gnome-pixmap-entry.h	Wed Jun 18 21:30:34 2008
@@ -37,7 +37,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-file-entry.h>
 
 G_BEGIN_DECLS

Modified: trunk/libgnomeui/gnome-pixmap.h
==============================================================================
--- trunk/libgnomeui/gnome-pixmap.h	(original)
+++ trunk/libgnomeui/gnome-pixmap.h	Wed Jun 18 21:30:34 2008
@@ -35,7 +35,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 
 G_BEGIN_DECLS

Modified: trunk/libgnomeui/gnome-popup-menu.h
==============================================================================
--- trunk/libgnomeui/gnome-popup-menu.h	(original)
+++ trunk/libgnomeui/gnome-popup-menu.h	Wed Jun 18 21:30:34 2008
@@ -29,7 +29,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
 

Modified: trunk/libgnomeui/gnome-stock-icons.h
==============================================================================
--- trunk/libgnomeui/gnome-stock-icons.h	(original)
+++ trunk/libgnomeui/gnome-stock-icons.h	Wed Jun 18 21:30:34 2008
@@ -26,9 +26,8 @@
 #ifndef __GNOME_STOCK_ICONS_H__
 #define __GNOME_STOCK_ICONS_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkstock.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-thumbnail.c
==============================================================================
--- trunk/libgnomeui/gnome-thumbnail.c	(original)
+++ trunk/libgnomeui/gnome-thumbnail.c	Wed Jun 18 21:30:34 2008
@@ -36,8 +36,6 @@
 #include <glib.h>
 #include <stdio.h>
 
-#include <glib/gchecksum.h>
-
 #define GDK_PIXBUF_ENABLE_BACKEND
 #include <gdk-pixbuf/gdk-pixbuf.h>
 

Modified: trunk/libgnomeui/gnome-ui-init.c
==============================================================================
--- trunk/libgnomeui/gnome-ui-init.c	(original)
+++ trunk/libgnomeui/gnome-ui-init.c	Wed Jun 18 21:30:34 2008
@@ -64,19 +64,7 @@
 
 #include "libgnomeuiP.h"
 
-#include <gtk/gtkversion.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkaccelmap.h>
-
-/* for sound events */
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtklinkbutton.h>
+#include <gtk/gtk.h>
 
 /*****************************************************************************
  * libgnomeui

Modified: trunk/libgnomeui/gnome-window-icon.c
==============================================================================
--- trunk/libgnomeui/gnome-window-icon.c	(original)
+++ trunk/libgnomeui/gnome-window-icon.c	Wed Jun 18 21:30:34 2008
@@ -12,7 +12,7 @@
 #include "libgnome/gnome-util.h"
 #include "libgnomeui/gnome-window-icon.h"
 
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 #include "libgnomeui/gnome-client.h"
 
 #include <stdlib.h>

Modified: trunk/libgnomeui/gnome-window-icon.h
==============================================================================
--- trunk/libgnomeui/gnome-window-icon.h	(original)
+++ trunk/libgnomeui/gnome-window-icon.h	Wed Jun 18 21:30:34 2008
@@ -23,7 +23,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnome-window.c
==============================================================================
--- trunk/libgnomeui/gnome-window.c	(original)
+++ trunk/libgnomeui/gnome-window.c	Wed Jun 18 21:30:34 2008
@@ -26,8 +26,7 @@
 #include <glib.h>
 #include <string.h>
 #include <libgnome/gnome-program.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 #include "gnome-window.h"
 #include "gnome-ui-init.h"

Modified: trunk/libgnomeui/gnome-window.h
==============================================================================
--- trunk/libgnomeui/gnome-window.h	(original)
+++ trunk/libgnomeui/gnome-window.h	Wed Jun 18 21:30:34 2008
@@ -17,7 +17,7 @@
 
 #ifndef GNOME_DISABLE_DEPRECATED
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeui/gnometypes.c
==============================================================================
--- trunk/libgnomeui/gnometypes.c	(original)
+++ trunk/libgnomeui/gnometypes.c	Wed Jun 18 21:30:34 2008
@@ -1,5 +1,5 @@
 #include <config.h>
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 #include <libgnomeui.h>
 
 void gnome_type_init (void);

Modified: trunk/libgnomeui/libgnomeui-access.c
==============================================================================
--- trunk/libgnomeui/libgnomeui-access.c	(original)
+++ trunk/libgnomeui/libgnomeui-access.c	Wed Jun 18 21:30:34 2008
@@ -20,8 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <config.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include <atk/atkrelationset.h>
 #include "libgnomeui-access.h"
 

Modified: trunk/libgnomeui/libgnomeui-access.h
==============================================================================
--- trunk/libgnomeui/libgnomeui-access.h	(original)
+++ trunk/libgnomeui/libgnomeui-access.h	Wed Jun 18 21:30:34 2008
@@ -28,8 +28,7 @@
 #include <atk/atkregistry.h>
 #include <atk/atkrelationset.h>
 #include <atk/atkobjectfactory.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 void _add_atk_name_desc   (GtkWidget *widget, gchar *name, gchar *desc);
 void _add_atk_description (GtkWidget *widget, gchar *desc);

Modified: trunk/libgnomeui/libgnomeuiP.h
==============================================================================
--- trunk/libgnomeui/libgnomeuiP.h	(original)
+++ trunk/libgnomeui/libgnomeuiP.h	Wed Jun 18 21:30:34 2008
@@ -28,7 +28,6 @@
 #define LIBGNOMEUIP_H
 
 #include <glib.h>
-#include <gtk/gtktypeutils.h>
 
 
 #include <libgnome/libgnome.h>

Modified: trunk/test-gnome/prop-editor.h
==============================================================================
--- trunk/test-gnome/prop-editor.h	(original)
+++ trunk/test-gnome/prop-editor.h	Wed Jun 18 21:30:34 2008
@@ -16,7 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifndef __PROP_EDITOR_H__
 #define __PROP_EDITOR_H__
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]