From 4200df5bdbf7d5cdb13764702e07a5acac6512e4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <maclas@gmx.de>
Date: Thu, 23 Oct 2003 20:44:13 +0000
Subject: [PATCH] Move GtkCombo and GtkOptionMenu to the "Deprecated" chapter.
 Add

Thu Oct 23 22:41:02 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtk-docs.sgml: Move GtkCombo and GtkOptionMenu to
	the "Deprecated" chapter. Add GtkFileChooser, GtkFileChooserDialog,
	GtkFileChooseWidget and GtkFileFilter.

	* gtk/gtkfilefilter.c (gtk_file_filter_new): Fix doc markup.
---
 ChangeLog                        |  4 ++++
 ChangeLog.pre-2-10               |  4 ++++
 ChangeLog.pre-2-4                |  4 ++++
 ChangeLog.pre-2-6                |  4 ++++
 ChangeLog.pre-2-8                |  4 ++++
 docs/reference/ChangeLog         |  6 ++++++
 docs/reference/gtk/gtk-docs.sgml | 12 ++++++++++--
 gtk/gtkfilefilter.c              |  2 +-
 8 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3076b238d..9a4e3dedd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 23 22:33:47 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilefilter.c (gtk_file_filter_new): Fix doc markup.
+
 Thu Oct 23 21:49:05 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* NEWS: Remove a few duplicates, group the menu changes.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d3076b238d..9a4e3dedd0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu Oct 23 22:33:47 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilefilter.c (gtk_file_filter_new): Fix doc markup.
+
 Thu Oct 23 21:49:05 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* NEWS: Remove a few duplicates, group the menu changes.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d3076b238d..9a4e3dedd0 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Thu Oct 23 22:33:47 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilefilter.c (gtk_file_filter_new): Fix doc markup.
+
 Thu Oct 23 21:49:05 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* NEWS: Remove a few duplicates, group the menu changes.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d3076b238d..9a4e3dedd0 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Thu Oct 23 22:33:47 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilefilter.c (gtk_file_filter_new): Fix doc markup.
+
 Thu Oct 23 21:49:05 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* NEWS: Remove a few duplicates, group the menu changes.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d3076b238d..9a4e3dedd0 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu Oct 23 22:33:47 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkfilefilter.c (gtk_file_filter_new): Fix doc markup.
+
 Thu Oct 23 21:49:05 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* NEWS: Remove a few duplicates, group the menu changes.
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 6e8243561c..9d1c3aa2ea 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 23 22:41:02 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-docs.sgml: Move GtkCombo and GtkOptionMenu to
+	the "Deprecated" chapter. Add GtkFileChooser, GtkFileChooserDialog,
+	GtkFileChooseWidget and GtkFileFilter.
+
 2003-10-23  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtk.types: Added gtk_file_chooser_get_type,
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 2910647107..c32ec5a516 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -33,6 +33,10 @@
 <!ENTITY GtkEntryCompletion SYSTEM "xml/gtkentrycompletion.xml">
 <!ENTITY GtkEventBox SYSTEM "xml/gtkeventbox.xml">
 <!ENTITY GtkExpander SYSTEM "xml/gtkexpander.xml">
+<!ENTITY GtkFileChooser SYSTEM "xml/gtkfilechooser.xml">
+<!ENTITY GtkFileChooserDialog SYSTEM "xml/gtkfilechooserdialog.xml">
+<!ENTITY GtkFileChooserWidget SYSTEM "xml/gtkfilechooserwidget.xml">
+<!ENTITY GtkFileFilter SYSTEM "xml/gtkfilefilter.xml">
 <!ENTITY GtkFileSelection SYSTEM "xml/gtkfilesel.xml">
 <!ENTITY GtkFixed SYSTEM "xml/gtkfixed.xml">
 <!ENTITY GtkFontButton SYSTEM "xml/gtkfontbutton.xml">
@@ -385,14 +389,12 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
 
     <chapter id="MenusAndCombos">
       <title>Menus, Combo Box, Toolbar</title>
-        &GtkCombo;
 	&GtkComboBox;
 	&GtkComboBoxEntry;
         &GtkMenu;
         &GtkMenuBar;
         &GtkMenuItem;
         &GtkMenuShell;
-        &GtkOptionMenu;
 	&GtkImageMenuItem;
         &GtkRadioMenuItem;
         &GtkCheckMenuItem;      
@@ -421,6 +423,10 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkColorSelection;
         &GtkColorSelectionDialog;
         &GtkFileSelection;
+	&GtkFileChooser;
+	&GtkFileChooserDialog;
+	&GtkFileChooserWidget;
+	&GtkFileFilter;
         &GtkFontButton;
         &GtkFontSelection;
         &GtkFontSelectionDialog;
@@ -509,6 +515,8 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
 
     <chapter id="DeprecatedObjects">
       <title>Deprecated</title>
+        &GtkCombo;
+        &GtkOptionMenu;
         &GtkItemFactory;
         &GtkCList;      
         &GtkCTree;
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 9f9c223965..bd47bd7885 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -152,7 +152,7 @@ gtk_file_filter_finalize (GObject  *object)
  * <informalexample><programlisting>
  * GtkFileFilter *filter = gtk_file_filter_new ();
  * gtk_file_filter_add_pattern (filter, "*");
- * </programlisting></programlisting>
+ * </programlisting></informalexample>
  * 
  * Return value: a new #GtkFileFilter
  **/