glade3 r2068 - in trunk: . gladeui src

[pgrzeg svn gnome org]

Author: pgrzeg
Date: Mon Dec 15 16:56:51 2008
New Revision: 2068
URL: http://svn.gnome.org/viewvc/glade3?rev=2068&view=rev

Log:
2008-12-15  PrzemysÅaw Grzegorczyk  <pgrzegorczyk gmail com>

	* src/glade-window.c:
	* src/glade-window.h:
	* gladeui/glade-palette-box.h:
	* gladeui/glade-design-view.h:
	* gladeui/glade-design-layout.h:
	* gladeui/glade-palette-expander.c:
	* gladeui/glade-palette-expander.h:
	* gladeui/glade-widget-adaptor.c:
	* gladeui/glade-palette-item.c:
	* gladeui/glade-palette-item.h:
	* gladeui/glade-palette.h:
	* gladeui/glade-named-icon-chooser-dialog.h:
	* gladeui/glade-app.c:
	* gladeui/glade-property-class.h: Cleaned up gtk and glib includes
	to use only toplevel headers. Patch from Maxim Ermilov. Bug #561260.


Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-app.c
   trunk/gladeui/glade-design-layout.h
   trunk/gladeui/glade-design-view.h
   trunk/gladeui/glade-named-icon-chooser-dialog.h
   trunk/gladeui/glade-palette-box.h
   trunk/gladeui/glade-palette-expander.c
   trunk/gladeui/glade-palette-expander.h
   trunk/gladeui/glade-palette-item.c
   trunk/gladeui/glade-palette-item.h
   trunk/gladeui/glade-palette.h
   trunk/gladeui/glade-property-class.h
   trunk/gladeui/glade-widget-adaptor.c
   trunk/src/glade-window.c
   trunk/src/glade-window.h

Modified: trunk/gladeui/glade-app.c
==============================================================================
--- trunk/gladeui/glade-app.c	(original)
+++ trunk/gladeui/glade-app.c	Mon Dec 15 16:56:51 2008
@@ -47,7 +47,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #define GLADE_CONFIG_FILENAME "glade-3.conf"
 

Modified: trunk/gladeui/glade-design-layout.h
==============================================================================
--- trunk/gladeui/glade-design-layout.h	(original)
+++ trunk/gladeui/glade-design-layout.h	Mon Dec 15 16:56:51 2008
@@ -25,7 +25,7 @@
 #ifndef __GLADE_DESIGN_LAYOUT_H__
 #define __GLADE_DESIGN_LAYOUT_H__
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gladeui/glade-design-view.h
==============================================================================
--- trunk/gladeui/glade-design-view.h	(original)
+++ trunk/gladeui/glade-design-view.h	Mon Dec 15 16:56:51 2008
@@ -29,7 +29,7 @@
 #include <gladeui/glade-project.h>
 #include <gladeui/glade-design-layout.h>
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gladeui/glade-named-icon-chooser-dialog.h
==============================================================================
--- trunk/gladeui/glade-named-icon-chooser-dialog.h	(original)
+++ trunk/gladeui/glade-named-icon-chooser-dialog.h	Mon Dec 15 16:56:51 2008
@@ -23,7 +23,7 @@
 #ifndef __GLADE_NAMED_ICON_CHOOSER_DIALOG_H__
 #define __GLADE_NAMED_ICON_CHOOSER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gladeui/glade-palette-box.h
==============================================================================
--- trunk/gladeui/glade-palette-box.h	(original)
+++ trunk/gladeui/glade-palette-box.h	Mon Dec 15 16:56:51 2008
@@ -26,7 +26,7 @@
 #ifndef __GLADE_PALETTE_BOX_H__
 #define __GLADE_PALETTE_BOX_H__
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gladeui/glade-palette-expander.c
==============================================================================
--- trunk/gladeui/glade-palette-expander.c	(original)
+++ trunk/gladeui/glade-palette-expander.c	Mon Dec 15 16:56:51 2008
@@ -25,13 +25,7 @@
 
 #include "glade-palette-expander.h"
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #define GLADE_PALETTE_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
 					       GLADE_TYPE_PALETTE_EXPANDER,      \

Modified: trunk/gladeui/glade-palette-expander.h
==============================================================================
--- trunk/gladeui/glade-palette-expander.h	(original)
+++ trunk/gladeui/glade-palette-expander.h	Mon Dec 15 16:56:51 2008
@@ -24,7 +24,7 @@
 #ifndef __GLADE_PALETTE_EXPANDER_H__
 #define __GLADE_PALETTE_EXPANDER_H__
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gladeui/glade-palette-item.c
==============================================================================
--- trunk/gladeui/glade-palette-item.c	(original)
+++ trunk/gladeui/glade-palette-item.c	Mon Dec 15 16:56:51 2008
@@ -25,10 +25,7 @@
 
 #include "config.h"
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #include "glade.h"
 #include "glade-palette-item.h"

Modified: trunk/gladeui/glade-palette-item.h
==============================================================================
--- trunk/gladeui/glade-palette-item.h	(original)
+++ trunk/gladeui/glade-palette-item.h	Mon Dec 15 16:56:51 2008
@@ -31,7 +31,7 @@
 #include <gladeui/glade-palette.h>
 #include <gladeui/glade-widget-adaptor.h>
 
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gladeui/glade-palette.h
==============================================================================
--- trunk/gladeui/glade-palette.h	(original)
+++ trunk/gladeui/glade-palette.h	Mon Dec 15 16:56:51 2008
@@ -31,7 +31,7 @@
 
 #include <gladeui/glade.h>
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gladeui/glade-property-class.h
==============================================================================
--- trunk/gladeui/glade-property-class.h	(original)
+++ trunk/gladeui/glade-property-class.h	Mon Dec 15 16:56:51 2008
@@ -4,7 +4,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 
 #include <gladeui/glade-xml-utils.h>
 

Modified: trunk/gladeui/glade-widget-adaptor.c
==============================================================================
--- trunk/gladeui/glade-widget-adaptor.c	(original)
+++ trunk/gladeui/glade-widget-adaptor.c	Mon Dec 15 16:56:51 2008
@@ -47,7 +47,7 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include <glib/gdir.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
 #include <ctype.h>

Modified: trunk/src/glade-window.c
==============================================================================
--- trunk/src/glade-window.c	(original)
+++ trunk/src/glade-window.c	Mon Dec 15 16:56:51 2008
@@ -36,7 +36,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #define ACTION_GROUP_STATIC             "GladeStatic"
 #define ACTION_GROUP_PROJECT            "GladeProject"

Modified: trunk/src/glade-window.h
==============================================================================
--- trunk/src/glade-window.h	(original)
+++ trunk/src/glade-window.h	Mon Dec 15 16:56:51 2008
@@ -21,7 +21,7 @@
 #ifndef __GLADE_WINDOW_H__
 #define __GLADE_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS