From a6b965efa1280b1665d2ea955a1f0d769197c475 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Jan 2009 04:53:14 +0000 Subject: [PATCH] Make tests work with current shared-mime-info svn path=/trunk/; revision=7783 --- gio/ChangeLog | 4 ++++ gio/xdgmime/test-mime.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index cdd1028..3cf89c3 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,7 @@ +2009-01-08 Matthias Clasen + + * xdgmime/test-mime.c: Make tests work with current shared-mime-info. + 2009-01-07 Matthias Clasen Bug 566770 – error code 0 for Too many open files is useless diff --git a/gio/xdgmime/test-mime.c b/gio/xdgmime/test-mime.c index d9a5b53..8473837 100644 --- a/gio/xdgmime/test-mime.c +++ b/gio/xdgmime/test-mime.c @@ -74,7 +74,7 @@ test_alias (const char *mime_a, static void test_aliasing (void) { - test_alias ("application/wordperfect", "application/vnd.wordperfect", 1); + test_alias ("application/x-wordperfect", "application/vnd.wordperfect", 1); test_alias ("application/x-gnome-app-info", "application/x-desktop", 1); test_alias ("application/x-wordperfect", "application/vnd.wordperfect", 1); test_alias ("application/x-wordperfect", "audio/x-midi", 0); @@ -151,7 +151,7 @@ test_one_icon (const char *mimetype, const char *expected) { const char *actual; - actual = xdg_mime_get_icon (mimetype); + actual = xdg_mime_get_generic_icon (mimetype); if (actual != expected && strcmp (actual, expected) != 0) { -- 2.7.4