From e0ca75c120a0a7f4885b53d81d53c1bb5444d542 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 8 Jun 2008 05:50:46 +0000 Subject: [PATCH] Replace uses of xdgmime with g_content_type. 2008-06-08 Matthias Clasen * gtk/gtkrecentmanager.c: * gtk/gtkrecentfilter.c: * gtk/gtkfilefilter.c: Replace uses of xdgmime with g_content_type. svn path=/trunk/; revision=20332 --- ChangeLog | 7 +++++++ gtk/gtkfilefilter.c | 13 ++----------- gtk/gtkrecentfilter.c | 13 ++----------- gtk/gtkrecentmanager.c | 5 ----- 4 files changed, 11 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0689322e2..bbb0c9410 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-08 Matthias Clasen + + * gtk/gtkrecentmanager.c: + * gtk/gtkrecentfilter.c: + * gtk/gtkfilefilter.c: Replace uses of xdgmime with + g_content_type. + 2008-06-08 Christian Persch Bug 535608 – do not string-copy accel paths in the menu code diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 8299ceba8..fc3e2dfdd 100644 --- 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 ad8b9773f..5de81cf20 100644 --- 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 076d51e5f..b7820c42f 100644 --- 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" -- 2.43.2