glib r7783 - in trunk/gio: . xdgmime

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Jan  9 04:53:14 2009
New Revision: 7783
URL: http://svn.gnome.org/viewvc/glib?rev=7783&view=rev

Log:
Make tests work with current shared-mime-info


Modified:
   trunk/gio/ChangeLog
   trunk/gio/xdgmime/test-mime.c

Modified: trunk/gio/xdgmime/test-mime.c
==============================================================================
--- trunk/gio/xdgmime/test-mime.c	(original)
+++ trunk/gio/xdgmime/test-mime.c	Fri Jan  9 04:53:14 2009
@@ -74,7 +74,7 @@
 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 @@
 {
   const char *actual;
 
-  actual = xdg_mime_get_icon (mimetype);
+  actual = xdg_mime_get_generic_icon (mimetype);
 
   if (actual != expected && strcmp (actual, expected) != 0) 
     {