From 22900f7853970fbe634d390fae37998746de71fe Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@gnome.org>
Date: Wed, 5 Mar 2008 15:36:41 +0000
Subject: [PATCH] Separate broken and deprecated sources and headers into
 different sections

2008-03-05  Johan Dahlin  <johan@gnome.org>

    * gtk/gtk.h:
    * gtk/Makefile.am:
    Separate broken and deprecated sources and headers into different sections


svn path=/trunk/; revision=19714
---
 ChangeLog       |  4 ++++
 gtk/Makefile.am | 57 ++++++++++++++++++++++++++++---------------------
 gtk/gtk.h       | 27 ++++++++++++-----------
 3 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe976fdfe5..aba82a8b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-05  Johan Dahlin  <johan@gnome.org>
 
+	* gtk/gtk.h: 
+	* gtk/Makefile.am:
+	Separate broken and deprecated sources and headers into different sections
+
 	* tests/buildertest.c (test_list_store): Restore accidentally broken test.
 
 2008-03-05  Kristian Rietveld  <kris@imendio.com>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9bf76e736c..b46d379b8a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -168,15 +168,12 @@ gtk_public_h_sources =          \
 	gtkcheckbutton.h	\
 	gtkcheckmenuitem.h	\
 	gtkclipboard.h		\
-	gtkclist.h		\
 	gtkcolorbutton.h	\
 	gtkcolorsel.h		\
 	gtkcolorseldialog.h	\
-	gtkcombo.h		\
 	gtkcombobox.h		\
 	gtkcomboboxentry.h	\
 	gtkcontainer.h		\
-	gtkctree.h		\
 	gtkcurve.h		\
 	gtkdebug.h              \
 	gtkdialog.h		\
@@ -193,7 +190,6 @@ gtk_public_h_sources =          \
 	gtkfilechooserdialog.h  \
 	gtkfilechooserwidget.h  \
 	gtkfilefilter.h		\
-	gtkfilesel.h		\
 	gtkfixed.h		\
 	gtkfontbutton.h		\
 	gtkfontsel.h		\
@@ -224,8 +220,6 @@ gtk_public_h_sources =          \
 	gtklabel.h		\
 	gtklayout.h             \
 	gtklinkbutton.h		\
-	gtklist.h		\
-	gtklistitem.h		\
 	gtkliststore.h		\
 	gtkmain.h		\
 	gtkmenu.h		\
@@ -238,8 +232,6 @@ gtk_public_h_sources =          \
 	gtkmodules.h		\
 	gtknotebook.h		\
 	gtkobject.h		\
-	gtkoldeditable.h	\
-	gtkoptionmenu.h		\
 	gtkpagesetup.h		\
 	gtkpaned.h		\
 	gtkpapersize.h		\
@@ -276,7 +268,6 @@ gtk_public_h_sources =          \
 	gtkseparatormenuitem.h	\
 	gtkseparatortoolitem.h	\
 	gtksettings.h		\
-	gtksignal.h		\
 	gtksizegroup.h		\
 	gtksocket.h		\
 	gtkspinbutton.h		\
@@ -287,7 +278,6 @@ gtk_public_h_sources =          \
 	gtktable.h		\
 	gtktearoffmenuitem.h    \
 	gtktestutils.h		\
-	gtktext.h		\
 	gtktextbuffer.h		\
 	gtktextbufferrichtext.h	\
 	gtktextchild.h		\
@@ -307,9 +297,7 @@ gtk_public_h_sources =          \
 	gtktoolshell.h		\
 	gtktooltip.h		\
 	gtktooltips.h		\
-	gtktree.h		\
 	gtktreednd.h		\
-	gtktreeitem.h		\
 	gtktreemodel.h		\
 	gtktreemodelfilter.h	\
 	gtktreemodelsort.h	\
@@ -435,15 +423,12 @@ gtk_base_c_sources =            \
 	gtkcellview.c		\
 	gtkcheckbutton.c	\
 	gtkcheckmenuitem.c	\
-	gtkclist.c		\
 	gtkcolorbutton.c	\
 	gtkcolorsel.c		\
 	gtkcolorseldialog.c	\
-	gtkcombo.c		\
 	gtkcombobox.c		\
 	gtkcomboboxentry.c	\
 	gtkcontainer.c		\
-	gtkctree.c		\
 	gtkcurve.c		\
 	gtkdialog.c		\
 	gtkdrawingarea.c	\
@@ -462,7 +447,6 @@ gtk_base_c_sources =            \
 	gtkfilechooserutils.c	\
 	gtkfilechooserwidget.c	\
 	gtkfilefilter.c		\
-	gtkfilesel.c		\
 	gtkfilesystem.c		\
 	gtkfilesystemmodel.c	\
 	gtkfixed.c		\
@@ -499,8 +483,6 @@ gtk_base_c_sources =            \
 	gtklabel.c		\
 	gtklayout.c		\
 	gtklinkbutton.c		\
-	gtklist.c		\
-	gtklistitem.c		\
 	gtkliststore.c		\
 	gtkmain.c		\
 	gtkmarshal.c		\
@@ -516,8 +498,6 @@ gtk_base_c_sources =            \
 	gtkmodules.c		\
 	gtknotebook.c		\
 	gtkobject.c		\
-	gtkoldeditable.c	\
-	gtkoptionmenu.c		\
 	gtkpagesetup.c		\
 	gtkpaned.c		\
 	gtkpapersize.c		\
@@ -558,7 +538,6 @@ gtk_base_c_sources =            \
 	gtkseparatormenuitem.c	\
 	gtkseparatortoolitem.c	\
 	gtksettings.c		\
-	gtksignal.c		\
 	gtksizegroup.c		\
 	gtksocket.c		\
 	gtkspinbutton.c		\
@@ -569,7 +548,6 @@ gtk_base_c_sources =            \
 	gtktable.c		\
 	gtktearoffmenuitem.c    \
 	gtktestutils.c		\
-	gtktext.c		\
 	gtktextbtree.c		\
 	gtktextbuffer.c		\
 	gtktextbufferrichtext.c	\
@@ -596,10 +574,8 @@ gtk_base_c_sources =            \
 	gtktoolshell.c		\
 	gtktooltip.c		\
 	gtktooltips.c		\
-	gtktree.c		\
 	gtktreedatalist.c	\
 	gtktreednd.c		\
-	gtktreeitem.c		\
 	gtktreemodel.c		\
 	gtktreemodelfilter.c	\
 	gtktreemodelsort.c	\
@@ -624,6 +600,39 @@ gtk_base_c_sources =            \
 	gtkwindow-decorate.c    \
 	gtkwindow.c		\
 	$(gtk_clipboard_dnd_c_sources)
+
+# Broken
+gtk_public_h_sources +=         \
+        gtktext.h               \
+        gtktree.h               \
+        gtktreeitem.h
+gtk_base_c_sources +=           \
+        gtktext.c               \
+        gtktree.c               \
+        gtktreeitem.c
+
+# Deprecated
+gtk_public_h_sources +=         \
+        gtkclist.h              \
+        gtkcombo.h              \
+        gtkctree.h              \
+        gtkfilesel.h            \
+        gtklist.h               \
+        gtklistitem.h           \
+        gtkoldeditable.h        \
+        gtkoptionmenu.h         \
+        gtksignal.h
+gtk_base_c_sources +=           \
+        gtkclist.c              \
+        gtkcombo.c              \
+        gtkctree.c              \
+        gtkfilesel.c            \
+        gtklist.c               \
+        gtklistitem.c           \
+        gtkoldeditable.c        \
+        gtkoptionmenu.c         \
+        gtksignal.c
+
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
 
diff --git a/gtk/gtk.h b/gtk/gtk.h
index d99756c8fd..57eb439701 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -62,15 +62,12 @@
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkclipboard.h>
-#include <gtk/gtkclist.h>
 #include <gtk/gtkcolorbutton.h>
 #include <gtk/gtkcolorsel.h>
 #include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkcombo.h>
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtkcomboboxentry.h>
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkctree.h>
 #include <gtk/gtkcurve.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkdnd.h>
@@ -81,7 +78,6 @@
 #include <gtk/gtkenums.h>
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtkexpander.h>
-#include <gtk/gtkfilesel.h>
 #include <gtk/gtkfixed.h>
 #include <gtk/gtkfilechooserbutton.h>
 #include <gtk/gtkfilechooserdialog.h>
@@ -114,8 +110,6 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtklayout.h>
 #include <gtk/gtklinkbutton.h>
-#include <gtk/gtklist.h>
-#include <gtk/gtklistitem.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
@@ -128,8 +122,6 @@
 #include <gtk/gtkmodules.h>
 #include <gtk/gtknotebook.h>
 #include <gtk/gtkobject.h>
-#include <gtk/gtkoldeditable.h>
-#include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkpaned.h>
 #include <gtk/gtkpixmap.h>
 #include <gtk/gtkplug.h>
@@ -160,7 +152,6 @@
 #include <gtk/gtkseparatormenuitem.h>
 #include <gtk/gtkseparatortoolitem.h>
 #include <gtk/gtksettings.h>
-#include <gtk/gtksignal.h>
 #include <gtk/gtksizegroup.h>
 #include <gtk/gtksocket.h>
 #include <gtk/gtkspinbutton.h>
@@ -170,7 +161,6 @@
 #include <gtk/gtkstyle.h>
 #include <gtk/gtktable.h>
 #include <gtk/gtktearoffmenuitem.h>
-#include <gtk/gtktext.h>
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextbufferrichtext.h>
 #include <gtk/gtktextview.h>
@@ -185,9 +175,7 @@
 #include <gtk/gtktooltip.h>
 #include <gtk/gtktooltips.h>
 #include <gtk/gtktestutils.h>
-#include <gtk/gtktree.h>
 #include <gtk/gtktreednd.h>
-#include <gtk/gtktreeitem.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreemodelfilter.h>
 #include <gtk/gtktreemodelsort.h>
@@ -210,5 +198,20 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
 
+/* Broken */
+#include <gtk/gtktext.h>
+#include <gtk/gtktree.h>
+#include <gtk/gtktreeitem.h>
+
+/* Deprecated */
+#include <gtk/gtkclist.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtkctree.h>
+#include <gtk/gtkfilesel.h>
+#include <gtk/gtklist.h>
+#include <gtk/gtklistitem.h>
+#include <gtk/gtkoldeditable.h>
+#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtksignal.h>
 
 #endif /* __GTK_H__ */