[seahorse] Revert "Use g_file_info_get_content_type instead of g_content_type_guess"
- From: Jeff Cai <jeffcai src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [seahorse] Revert "Use g_file_info_get_content_type instead of g_content_type_guess"
- Date: Wed, 21 Oct 2009 03:25:22 +0000 (UTC)
commit 2153aab3cdd457732204a4988eb13c56d52fd567
Author: Jeff Cai <jeff cai sun com>
Date: Wed Oct 21 11:23:24 2009 +0800
Revert "Use g_file_info_get_content_type instead of g_content_type_guess"
This reverts commit 38849c3de2465b731ac3564c5069d96b02549018.
libseahorse/seahorse-util.c | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/libseahorse/seahorse-util.c b/libseahorse/seahorse-util.c
index da343c7..138f162 100644
--- a/libseahorse/seahorse-util.c
+++ b/libseahorse/seahorse-util.c
@@ -846,26 +846,14 @@ GQuark
seahorse_util_detect_file_type (const gchar *uri)
{
gboolean uncertain;
- gchar *mime = NULL;
+ gchar *mime;
GQuark type;
- GFile *file;
- GFileInfo *info;
-
- file = g_file_new_for_uri (uri);
- info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- 0,
- NULL,
- NULL);
-
- g_return_val_if_fail (info, 0);
-
- mime = g_file_info_get_content_type (info);
+ mime = g_content_type_guess (uri, NULL, 0, &uncertain);
g_return_val_if_fail (mime, 0);
type = seahorse_util_detect_mime_type (mime);
- g_object_unref (info);
+ g_free (mime);
return type;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]