Remove deprecated GtkMenuBar functions (macros)

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

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 2c7f6fee704e711cdaa751055562349ec0138c75..f64c5761bfcef110aee3b3e4446b2abbd804da18 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -18,21 +18,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
 #include "gtkfilefilter.h"
-#include "gtkobject.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
 #include "gtkalias.h"
 
-#ifdef G_OS_UNIX
-#define XDG_PREFIX _gtk_xdg
-#include "xdgmime/xdgmime.h"
-#endif
-
 typedef struct _GtkFileFilterClass GtkFileFilterClass;
 typedef struct _FilterRule FilterRule;
 
@@ -119,7 +113,7 @@ filter_rule_free (FilterRule *rule)
       g_assert_not_reached ();
     }
 
-  g_free (rule);
+  g_slice_free (FilterRule, rule);
 }
 
 static void
@@ -144,11 +138,10 @@ gtk_file_filter_finalize (GObject  *object)
  * gtk_file_filter_add_mime_type(), gtk_file_filter_add_pattern(),
  * or gtk_file_filter_add_custom(). To create a filter
  * that accepts any file, use:
- *
- * <informalexample><programlisting>
- * GtkFileFilter *filter = gtk_file_filter_new (<!-- -->);
+ * |[
+ * GtkFileFilter *filter = gtk_file_filter_new ();
  * gtk_file_filter_add_pattern (filter, "*");
- * </programlisting></informalexample>
+ * ]|
  * 
  * Return value: a new #GtkFileFilter
  * 
@@ -163,7 +156,7 @@ gtk_file_filter_new (void)
 /**
  * gtk_file_filter_set_name:
  * @filter: a #GtkFileFilter
- * @name: the human-readable-name for the filter, or %NULL
+ * @name: (allow-none): the human-readable-name for the filter, or %NULL
  *   to remove any existing name.
  * 
  * Sets the human-readable name of the filter; this is the string
@@ -229,7 +222,7 @@ gtk_file_filter_add_mime_type (GtkFileFilter *filter,
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
   g_return_if_fail (mime_type != NULL);
 
-  rule = g_new (FilterRule, 1);
+  rule = g_slice_new (FilterRule);
   rule->type = FILTER_RULE_MIME_TYPE;
   rule->needed = GTK_FILE_FILTER_MIME_TYPE;
   rule->u.mime_type = g_strdup (mime_type);
@@ -255,7 +248,7 @@ gtk_file_filter_add_pattern (GtkFileFilter *filter,
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
   g_return_if_fail (pattern != NULL);
 
-  rule = g_new (FilterRule, 1);
+  rule = g_slice_new (FilterRule);
   rule->type = FILTER_RULE_PATTERN;
   rule->needed = GTK_FILE_FILTER_DISPLAY_NAME;
   rule->u.pattern = g_strdup (pattern);
@@ -279,7 +272,7 @@ gtk_file_filter_add_pixbuf_formats (GtkFileFilter *filter)
   
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
 
-  rule = g_new (FilterRule, 1);
+  rule = g_slice_new (FilterRule);
   rule->type = FILTER_RULE_PIXBUF_FORMATS;
   rule->needed = GTK_FILE_FILTER_MIME_TYPE;
   rule->u.pixbuf_formats = gdk_pixbuf_get_formats ();
@@ -317,7 +310,7 @@ gtk_file_filter_add_custom (GtkFileFilter         *filter,
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
   g_return_if_fail (func != NULL);
 
-  rule = g_new (FilterRule, 1);
+  rule = g_slice_new (FilterRule);
   rule->type = FILTER_RULE_CUSTOM;
   rule->needed = needed;
   rule->u.custom.func = func;
@@ -383,12 +376,8 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
       switch (rule->type)
        {
        case FILTER_RULE_MIME_TYPE:
-         if (filter_info->mime_type != NULL
-#ifdef G_OS_UNIX
-             && xdg_mime_mime_type_subclass (filter_info->mime_type, rule->u.mime_type))
-#else
-             && strcmp (rule->u.mime_type, filter_info->mime_type) == 0)
-#endif
+         if (filter_info->mime_type != NULL &&
+              g_content_type_is_a (filter_info->mime_type, rule->u.mime_type))
            return TRUE;
          break;
        case FILTER_RULE_PATTERN: