summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-06-23 14:07:19 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-06-23 14:07:19 +0000
commit77e99003a867b7167264840377bf46339a65494d (patch)
tree7ce7353079751d73c519cc4120ccc81b1b100667
parented7d0ed47ede155141bb8947a5f56f4d1f4603bd (diff)
downloadgtk+-77e99003a867b7167264840377bf46339a65494d.tar.gz
gtk/gtkaction.h gtk/gtkbuildable.h gtk/gtkbuilderprivate.h
2008-06-23 Michael Natterer <mitch@imendio.com> * gtk/gtkaction.h * gtk/gtkbuildable.h * gtk/gtkbuilderprivate.h * gtk/gtkcelllayout.h * gtk/gtkentrycompletion.h * gtk/gtkfilechoosersettings.h * gtk/gtkfilesystem.h * gtk/gtkfilesystemmodel.h * gtk/gtkicontheme.h * gtk/gtklinkbutton.h * gtk/gtkpagesetup.h * gtk/gtkpapersize.h * gtk/gtkprintcontext.h * gtk/gtkprintoperation.h * gtk/gtkprintoperationpreview.h * gtk/gtkprintsettings.h * gtk/gtkrecentchooserprivate.h * gtk/gtkrecentmanager.h * gtk/gtksearchengine.h * gtk/gtktexttag.h * gtk/gtktreeselection.h * gtk/gtktreeviewcolumn.h * gtk/gtkuimanager.h: remove redundant inclusion of <glib.h> and <glib-object.h>. There is no point in relying on them being pulled in by other headers in some places and placing them explicitly in other places, so choose the "as little includes as possible" approach and get rid of them. svn path=/trunk/; revision=20675
-rw-r--r--ChangeLog30
-rw-r--r--gtk/gtkaction.h1
-rw-r--r--gtk/gtkbuildable.h1
-rw-r--r--gtk/gtkbuilderprivate.h1
-rw-r--r--gtk/gtkcelllayout.h2
-rw-r--r--gtk/gtkentrycompletion.h2
-rw-r--r--gtk/gtkfilechoosersettings.h1
-rw-r--r--gtk/gtkfilesystem.h1
-rw-r--r--gtk/gtkfilesystemmodel.h1
-rw-r--r--gtk/gtkicontheme.h1
-rw-r--r--gtk/gtklinkbutton.h1
-rw-r--r--gtk/gtkpagesetup.h1
-rw-r--r--gtk/gtkpapersize.h1
-rw-r--r--gtk/gtkprintcontext.h1
-rw-r--r--gtk/gtkprintoperation.h1
-rw-r--r--gtk/gtkprintoperationpreview.h1
-rw-r--r--gtk/gtkprintsettings.h1
-rw-r--r--gtk/gtkrecentchooserprivate.h6
-rw-r--r--gtk/gtkrecentmanager.h1
-rw-r--r--gtk/gtksearchengine.h1
-rw-r--r--gtk/gtktexttag.h1
-rw-r--r--gtk/gtktreeselection.h3
-rw-r--r--gtk/gtktreeviewcolumn.h1
-rw-r--r--gtk/gtkuimanager.h3
24 files changed, 32 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 46b737de4e..8d521c41fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2008-06-23 Michael Natterer <mitch@imendio.com>
+
+ * gtk/gtkaction.h
+ * gtk/gtkbuildable.h
+ * gtk/gtkbuilderprivate.h
+ * gtk/gtkcelllayout.h
+ * gtk/gtkentrycompletion.h
+ * gtk/gtkfilechoosersettings.h
+ * gtk/gtkfilesystem.h
+ * gtk/gtkfilesystemmodel.h
+ * gtk/gtkicontheme.h
+ * gtk/gtklinkbutton.h
+ * gtk/gtkpagesetup.h
+ * gtk/gtkpapersize.h
+ * gtk/gtkprintcontext.h
+ * gtk/gtkprintoperation.h
+ * gtk/gtkprintoperationpreview.h
+ * gtk/gtkprintsettings.h
+ * gtk/gtkrecentchooserprivate.h
+ * gtk/gtkrecentmanager.h
+ * gtk/gtksearchengine.h
+ * gtk/gtktexttag.h
+ * gtk/gtktreeselection.h
+ * gtk/gtktreeviewcolumn.h
+ * gtk/gtkuimanager.h: remove redundant inclusion of <glib.h> and
+ <glib-object.h>. There is no point in relying on them being pulled
+ in by other headers in some places and placing them explicitly in
+ other places, so choose the "as little includes as possible"
+ approach and get rid of them.
+
2008-06-23 Kristian Rietveld <kris@imendio.com>
* gdk/gdkenumtypes.h.template:
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 4e1675dd0d..7c3177b68e 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -36,7 +36,6 @@
#define __GTK_ACTION_H__
#include <gtk/gtkwidget.h>
-#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 73dbcbde01..bff876d0cb 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -25,7 +25,6 @@
#ifndef __GTK_BUILDABLE_H__
#define __GTK_BUILDABLE_H__
-#include <glib.h>
#include <gtk/gtkbuilder.h>
#include <gtk/gtktypeutils.h>
diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index ded6f238be..b860e6e12c 100644
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -21,7 +21,6 @@
#ifndef __GTK_BUILDER_PRIVATE_H__
#define __GTK_BUILDER_PRIVATE_H__
-#include <glib-object.h>
#include "gtkbuilder.h"
typedef struct {
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index b1e9fb8a81..b3d8d06090 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -24,8 +24,6 @@
#ifndef __GTK_CELL_LAYOUT_H__
#define __GTK_CELL_LAYOUT_H__
-#include <glib-object.h>
-
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtktreeviewcolumn.h>
#include <gtk/gtkbuildable.h>
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 14365ff613..f0f05aa430 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -24,8 +24,6 @@
#ifndef __GTK_ENTRY_COMPLETION_H__
#define __GTK_ENTRY_COMPLETION_H__
-#include <glib-object.h>
-
#include <gtk/gtktreemodel.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtktreeviewcolumn.h>
diff --git a/gtk/gtkfilechoosersettings.h b/gtk/gtkfilechoosersettings.h
index bde1eeeaa2..c7c4179d38 100644
--- a/gtk/gtkfilechoosersettings.h
+++ b/gtk/gtkfilechoosersettings.h
@@ -23,7 +23,6 @@
#ifndef __GTK_FILE_CHOOSER_SETTINGS_H__
#define __GTK_FILE_CHOOSER_SETTINGS_H__
-#include <glib-object.h>
#include "gtkfilechooserprivate.h"
G_BEGIN_DECLS
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index fa708fe570..87eaf54236 100644
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -22,7 +22,6 @@
#define __GTK_FILE_SYSTEM_H__
#include <gio/gio.h>
-#include <glib-object.h>
#include <gtk/gtkwidget.h> /* For icon handling */
G_BEGIN_DECLS
diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h
index 664aaf2b37..750fa33663 100644
--- a/gtk/gtkfilesystemmodel.h
+++ b/gtk/gtkfilesystemmodel.h
@@ -21,7 +21,6 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
-#include <glib-object.h>
#include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h>
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 74f6e30077..b6d7d31fe2 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -24,7 +24,6 @@
#ifndef __GTK_ICON_THEME_H__
#define __GTK_ICON_THEME_H__
-#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h>
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index a621673e9c..8be025c97d 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -29,7 +29,6 @@
#ifndef __GTK_LINK_BUTTON_H__
#define __GTK_LINK_BUTTON_H__
-#include <glib.h>
#include <gtk/gtkbutton.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index edabb32d7d..635c7efb9b 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -25,7 +25,6 @@
#ifndef __GTK_PAGE_SETUP_H__
#define __GTK_PAGE_SETUP_H__
-#include <glib-object.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkpapersize.h>
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 49324fb209..d7940e62d0 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -25,7 +25,6 @@
#ifndef __GTK_PAPER_SIZE_H__
#define __GTK_PAPER_SIZE_H__
-#include <glib-object.h>
#include <gtk/gtkenums.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 5c69b9aa52..debeed6ae5 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -25,7 +25,6 @@
#ifndef __GTK_PRINT_CONTEXT_H__
#define __GTK_PRINT_CONTEXT_H__
-#include <glib-object.h>
#include <pango/pango.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkpagesetup.h>
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 00f8de6bff..6e6565fc08 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -25,7 +25,6 @@
#ifndef __GTK_PRINT_OPERATION_H__
#define __GTK_PRINT_OPERATION_H__
-#include <glib-object.h>
#include <cairo.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkenums.h>
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index c098a25f4a..a36b4afb71 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -25,7 +25,6 @@
#ifndef __GTK_PRINT_OPERATION_PREVIEW_H__
#define __GTK_PRINT_OPERATION_PREVIEW_H__
-#include <glib-object.h>
#include <cairo.h>
#include <gtk/gtkprintcontext.h>
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 493160b651..169e22b28f 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -25,7 +25,6 @@
#ifndef __GTK_PRINT_SETTINGS_H__
#define __GTK_PRINT_SETTINGS_H__
-#include <glib-object.h>
#include <gtk/gtkpapersize.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkrecentchooserprivate.h b/gtk/gtkrecentchooserprivate.h
index afe8928f75..1057d05190 100644
--- a/gtk/gtkrecentchooserprivate.h
+++ b/gtk/gtkrecentchooserprivate.h
@@ -19,12 +19,10 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-
+
#ifndef __GTK_RECENT_CHOOSER_PRIVATE_H__
#define __GTK_RECENT_CHOOSER_PRIVATE_H__
-#include <glib-object.h>
-
#include "gtkrecentmanager.h"
#include "gtkrecentchooser.h"
@@ -40,5 +38,5 @@ void _gtk_recent_chooser_item_activated (GtkRecentChooser *cho
void _gtk_recent_chooser_selection_changed (GtkRecentChooser *chooser);
G_END_DECLS
-
+
#endif /* ! __GTK_RECENT_CHOOSER_PRIVATE_H__ */
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 2c171ef913..4127e67b21 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -25,7 +25,6 @@
#ifndef __GTK_RECENT_MANAGER_H__
#define __GTK_RECENT_MANAGER_H__
-#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h>
#include <time.h>
diff --git a/gtk/gtksearchengine.h b/gtk/gtksearchengine.h
index 3b0a34c8c0..91251b3d3b 100644
--- a/gtk/gtksearchengine.h
+++ b/gtk/gtksearchengine.h
@@ -23,7 +23,6 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__
-#include <glib-object.h>
#include "gtkquery.h"
G_BEGIN_DECLS
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 4123768a4a..b1df01165e 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -54,7 +54,6 @@
#ifndef __GTK_TEXT_TAG_H__
#define __GTK_TEXT_TAG_H__
-#include <glib-object.h>
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 885b144e92..ece7ab8e6c 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -24,10 +24,8 @@
#ifndef __GTK_TREE_SELECTION_H__
#define __GTK_TREE_SELECTION_H__
-#include <glib-object.h>
#include <gtk/gtktreeview.h>
-
G_BEGIN_DECLS
@@ -124,5 +122,4 @@ void gtk_tree_selection_unselect_range (GtkTreeSelection
G_END_DECLS
-
#endif /* __GTK_TREE_SELECTION_H__ */
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 9552b277f9..9238a623ce 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -24,7 +24,6 @@
#ifndef __GTK_TREE_VIEW_COLUMN_H__
#define __GTK_TREE_VIEW_COLUMN_H__
-#include <glib-object.h>
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 1b1765f2fe..240c7d30ba 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -35,9 +35,6 @@
#ifndef __GTK_UI_MANAGER_H__
#define __GTK_UI_MANAGER_H__
-
-#include <glib.h>
-#include <glib-object.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkaction.h>