From 0f1e907fd7a346deb14ddf0f849fe1659eb75448 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 12 Oct 2006 13:47:10 +0000 Subject: [PATCH] raster wants mime types, raster gets mime types. SVN revision: 26549 --- legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h | 2 +- legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h b/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h index 191acab90d..1776d0a8d0 100644 --- a/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h +++ b/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h @@ -34,7 +34,7 @@ struct _Ecore_Desktop * space and cycles that just covers up bugs. On the other hand, it makes * for a more robust library, and it's used everywhere else in ecore. */ - Ecore_Hash *data, *group, *Categories, *OnlyShowIn, *NotShowIn; + Ecore_Hash *data, *group, *Categories, *OnlyShowIn, *NotShowIn, *MimeTypes, *Actions; char *original_path; char *original_lang; char *eap_name; diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c index 3e689a98ff..d11c3fdc2b 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c @@ -424,6 +424,14 @@ _ecore_desktop_get(const char *file, const char *lang) } } + value = ecore_hash_get(result->group, "MimeType"); + if (value) + result->MimeTypes = + ecore_desktop_paths_to_hash(value); + value = ecore_hash_get(result->group, "Actions"); + if (value) + result->Actions = + ecore_desktop_paths_to_hash(value); value = ecore_hash_get(result->group, "OnlyShowIn"); if (value) result->OnlyShowIn = @@ -447,7 +455,6 @@ _ecore_desktop_get(const char *file, const char *lang) value = ecore_hash_get(result->group, "Hidden"); if (value) result->hidden = (strcmp(value, "true") == 0); - } else { @@ -625,7 +632,7 @@ ecore_desktop_save(Ecore_Desktop * desktop) else ecore_hash_remove(desktop->group, "Hidden"); - /* FIXME: deal with the ShowIn's. */ + /* FIXME: deal with the ShowIn's and mime stuff. */ if (desktop->path) ecore_hash_set(desktop->group, strdup("Path"), @@ -778,6 +785,8 @@ _ecore_desktop_destroy(Ecore_Desktop * desktop) if (desktop->NotShowIn) ecore_hash_destroy(desktop->NotShowIn); if (desktop->OnlyShowIn) ecore_hash_destroy(desktop->OnlyShowIn); if (desktop->Categories) ecore_hash_destroy(desktop->Categories); + if (desktop->MimeTypes) ecore_hash_destroy(desktop->MimeTypes); + if (desktop->Actions) ecore_hash_destroy(desktop->Actions); if (desktop->data) { ecore_hash_destroy(desktop->data);