GtkEntry: Sanity check the end_pos value in _get_display_text()

[~andy/gtk] / gtk / gtkfilefilter.c

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 3845956206bc82f9dd3827fd451bdf36b3ce0f64..5b060960c07e1848439fb501d02d9a02ac87cbb7 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -13,15 +13,14 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * SECTION:gtkfilefilter
  * @Short_description: A filter for selecting a file subset
  * @Title: GtkFileFilter
+ * @see_also: #GtkFileChooser
  *
  * A GtkFileFilter can be used to restrict the files being shown in a
  * #GtkFileChooser. Files can be filtered based on their name (with
@@ -33,7 +32,7 @@
  * types; e.g. a filter for text/plain also matches a file with mime
  * type application/rtf, since application/rtf is a subclass of
  * text/plain. Note that #GtkFileFilter allows wildcards for the
- * subtype of a mime type, so you can e.g. filter for image/<!---->*.
+ * subtype of a mime type, so you can e.g. filter for image/&ast;.
  *
  * Normally, filters are used by adding them to a #GtkFileChooser,
  * see gtk_file_chooser_add_filter(), but it is also possible
@@ -43,9 +42,9 @@
  * <title>GtkFileFilter as GtkBuildable</title>
  * <para>
  * The GtkFileFilter implementation of the GtkBuildable interface
- * supports adding rules using the &lt;mime-types&gt, &lt;patterns&gt and
- * &lt;applications&gt elements and listing the rules within. Specifying
- * a &lt;mime-type&gt or &lt;pattern&gt is the same
+ * supports adding rules using the &lt;mime-types&gt;, &lt;patterns&gt; and
+ * &lt;applications&gt; elements and listing the rules within. Specifying
+ * a &lt;mime-type&gt; or &lt;pattern&gt; is the same
  * as calling gtk_recent_filter_add_mime_type() or gtk_recent_filter_add_pattern()
  *
  * <example>
@@ -54,7 +53,7 @@
  * <object class="GtkFileFilter">
  *   <mime-types>
  *     <mime-type>text/plain</mime-type>
- *     <mime-type>image/png</mime-type>
+ *     <mime-type>image/&ast;</mime-type>
  *   </mime-types>
  *   <patterns>
  *     <pattern>*.txt</pattern>
@@ -65,8 +64,6 @@
  * </example>
  * </para>
  * </refsect2>
- *
- * @see_also: #GtkFileChooser
  */
 
 #include "config.h"
@@ -404,7 +401,7 @@ gtk_file_filter_set_name (GtkFileFilter *filter,
  * 
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_file_filter_get_name (GtkFileFilter *filter)
 {
   g_return_val_if_fail (GTK_IS_FILE_FILTER (filter), NULL);