Replace uses of xdgmime with g_content_type.

2008-06-08  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkrecentmanager.c:
        * gtk/gtkrecentfilter.c:
        * gtk/gtkfilefilter.c: Replace uses of xdgmime with
        g_content_type.

svn path=/trunk/; revision=20332

diff --git a/ChangeLog b/ChangeLog
index 0689322e26f69e0663e2512075b08ce70116e4c3..bbb0c941079dbb809056e37ec32ca07b14d66e06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkrecentmanager.c:
+       * gtk/gtkrecentfilter.c:
+       * gtk/gtkfilefilter.c: Replace uses of xdgmime with
+       g_content_type.
+       
 2008-06-08  Christian Persch <chpe@gnome.org>
 
        Bug 535608 – do not string-copy accel paths in the menu code

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 8299ceba8146e225e0334be9c52064731299b0de..fc3e2dfdd625d156f0f429f24366d72ac486b7de 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -27,11 +27,6 @@
 
 #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;
 
@@ -381,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:

diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index ad8b9773f160dc34fd499bbcdd7c10778e689fc6..5de81cf20dfaa4caf84fe82da87720070a8f756f 100644 (file)
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -27,11 +27,6 @@
 
 #include "gtkalias.h"
 
-#ifdef G_OS_UNIX
-#define XDG_PREFIX _gtk_xdg
-#include "xdgmime/xdgmime.h"
-#endif
-
 typedef struct _GtkRecentFilterClass GtkRecentFilterClass;
 typedef struct _FilterRule FilterRule;
 
@@ -490,12 +485,8 @@ gtk_recent_filter_filter (GtkRecentFilter           *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 (filter_info->mime_type, rule->u.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_APPLICATION:

diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 076d51e5f3e39bf1f1c991adb1d5197a7f4d2f07..b7820c42f9ae12313d57bc07237938bf6847e8a4 100644 (file)
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -41,11 +41,6 @@
 #include "gtkmarshalers.h"
 #include "gtkalias.h"
 
-#ifdef G_OS_UNIX
-#define XDG_PREFIX _gtk_xdg
-#include "xdgmime/xdgmime.h"
-#endif
-
 /* the file where we store the recently used items */
 #define GTK_RECENTLY_USED_FILE ".recently-used.xbel"