From 058d88d9c4efd032d260d98453795bef890d470e Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com> Date: Sun, 17 Aug 2008 23:39:28 -0500 Subject: [PATCH] There is no more MOO_USE_XDGMIME and especially MOO_US_XDGMIME --- moo/moofileview/moofile.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/moo/moofileview/moofile.c b/moo/moofileview/moofile.c index 932cf0cb..f2429dd1 100644 --- a/moo/moofileview/moofile.c +++ b/moo/moofileview/moofile.c @@ -46,12 +46,7 @@ MOO_DEBUG_INIT(file, FALSE) -#ifdef MOO_US_XDGMIME #define MIME_TYPE_UNKNOWN xdg_mime_type_unknown -#else -static const char *mime_type_unknown = "application/octet-stream"; -#define MIME_TYPE_UNKNOWN mime_type_unknown -#endif #define NORMAL_PRIORITY G_PRIORITY_DEFAULT_IDLE #define NORMAL_TIMEOUT 0.04 @@ -122,7 +117,7 @@ create_collation_key (CollatorRef collator, if (try_len <= sizeof buf) { - ret = UCGetCollationKey (collator, str_utf16, len_utf16, + ret = UCGetCollationKey (collator, str_utf16, len_utf16, sizeof buf, &actual_len, buf); if (ret == 0) @@ -139,7 +134,7 @@ create_collation_key (CollatorRef collator, if (!key) { key = g_malloc (sizeof (MooCollationKey) + (try_len - 1) * sizeof (UCCollationValue)); - ret = UCGetCollationKey (collator, str_utf16, len_utf16, + ret = UCGetCollationKey (collator, str_utf16, len_utf16, try_len, &actual_len, key->buf); if (ret == kCollateBufferTooSmall) @@ -199,7 +194,7 @@ moo_get_collation_key_for_filename (const char *str, | kUCCollateCaseInsensitiveMask | kUCCollateDigitsOverrideMask | kUCCollateDigitsAsNumberMask - | kUCCollatePunctuationSignificantMask, + | kUCCollatePunctuationSignificantMask, &collator); if (!collator)