From 96a20ffd9138627908f43c76282a7dbe6c2e1354 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Sun, 24 Jan 2010 21:21:27 +0000 Subject: [PATCH] Update to spec 1.1 %n, %N, %d and %D is deprecated, and version is string SVN revision: 45532 --- legacy/efreet/src/lib/efreet_desktop.c | 30 +++++++------------------- legacy/efreet/src/lib/efreet_desktop.h | 2 +- legacy/efreet/src/lib/efreet_private.h | 4 +--- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c index 5bfadfcc8b..b6a1af67aa 100644 --- a/legacy/efreet/src/lib/efreet_desktop.c +++ b/legacy/efreet/src/lib/efreet_desktop.c @@ -22,7 +22,7 @@ #include "Efreet.h" #include "efreet_private.h" -#define DESKTOP_VERSION 1.0 +#define DESKTOP_VERSION "1.0" /** * The current desktop environment (e.g. "Enlightenment" or "Gnome") @@ -355,8 +355,11 @@ efreet_desktop_read(Efreet_Desktop *desktop) info = efreet_desktop_type_parse(efreet_ini_string_get(ini, "Type")); if (info) { + const char *val; + desktop->type = info->id; - desktop->version = efreet_ini_double_get(ini, "Version"); + val = efreet_ini_string_get(ini, "Version"); + if (val) desktop->version = strdup(val); if (info->parse_func) desktop->type_data = info->parse_func(desktop, ini); @@ -472,7 +475,7 @@ efreet_desktop_save(Efreet_Desktop *desktop) efreet_desktop_generic_fields_save(desktop, ini); /* When we save the file, it should be updated to the * latest version that we support! */ - efreet_ini_double_set(ini, "Version", DESKTOP_VERSION); + efreet_ini_string_set(ini, "Version", DESKTOP_VERSION); if (!efreet_ini_save(ini, desktop->orig_path)) ok = 0; else @@ -530,6 +533,7 @@ efreet_desktop_free(Efreet_Desktop *desktop) IF_FREE(desktop->orig_path); + IF_FREE(desktop->version); IF_FREE(desktop->name); IF_FREE(desktop->generic_name); IF_FREE(desktop->comment); @@ -1270,14 +1274,6 @@ efreet_desktop_command_flags_get(Efreet_Desktop *desktop) case 'U': flags |= EFREET_DESKTOP_EXEC_FLAG_URI; break; - case 'd': - case 'D': - flags |= EFREET_DESKTOP_EXEC_FLAG_DIR; - break; - case 'n': - case 'N': - flags |= EFREET_DESKTOP_EXEC_FLAG_FILE; - break; case '%': p++; break; @@ -1633,9 +1629,7 @@ efreet_desktop_command_file_process(Efreet_Desktop_Command *command, const char /* DBG("FLAGS: %d, %d, %d, %d\n", command->flags & EFREET_DESKTOP_EXEC_FLAG_FULLPATH ? 1 : 0, - command->flags & EFREET_DESKTOP_EXEC_FLAG_URI ? 1 : 0, - command->flags & EFREET_DESKTOP_EXEC_FLAG_DIR ? 1 : 0, - command->flags & EFREET_DESKTOP_EXEC_FLAG_FILE ? 1 : 0); + command->flags & EFREET_DESKTOP_EXEC_FLAG_URI ? 1 : 0); */ f = NEW(Efreet_Desktop_Command_File, 1); if (!f) return NULL; @@ -1678,10 +1672,6 @@ efreet_desktop_command_file_process(Efreet_Desktop_Command *command, const char if (command->flags & EFREET_DESKTOP_EXEC_FLAG_URI) f->uri = strdup(uri); - if (command->flags & EFREET_DESKTOP_EXEC_FLAG_DIR) - f->dir = strdup("/tmp"); - if (command->flags & EFREET_DESKTOP_EXEC_FLAG_FILE) - f->file = strdup(base); } else { @@ -1696,10 +1686,6 @@ efreet_desktop_command_file_process(Efreet_Desktop_Command *command, const char snprintf(buf, sizeof(buf), "file://%s", abs); f->uri = strdup(buf); } - if (command->flags & EFREET_DESKTOP_EXEC_FLAG_DIR) - f->dir = ecore_file_dir_get(abs); - if (command->flags & EFREET_DESKTOP_EXEC_FLAG_FILE) - f->file = strdup(ecore_file_file_get(file)); free(abs); } diff --git a/legacy/efreet/src/lib/efreet_desktop.h b/legacy/efreet/src/lib/efreet_desktop.h index c3ca2b446d..b6394dbe6d 100644 --- a/legacy/efreet/src/lib/efreet_desktop.h +++ b/legacy/efreet/src/lib/efreet_desktop.h @@ -59,7 +59,7 @@ struct _Efreet_Desktop int ref; /**< reference count - internal */ int cache_flush; /**< cache flush value - internal */ - double version; /**< version of spec file conforms to */ + char *version; /**< version of spec file conforms to */ char *orig_path; /**< original path to .desktop file */ long long load_time; /**< modified time of .desktop on disk */ diff --git a/legacy/efreet/src/lib/efreet_private.h b/legacy/efreet/src/lib/efreet_private.h index 9295db5b9f..47674d1437 100644 --- a/legacy/efreet/src/lib/efreet_private.h +++ b/legacy/efreet/src/lib/efreet_private.h @@ -121,9 +121,7 @@ extern int _efreet_log_dom_global; typedef enum Efreet_Desktop_Command_Flag { EFREET_DESKTOP_EXEC_FLAG_FULLPATH = 0x0001, - EFREET_DESKTOP_EXEC_FLAG_URI = 0x0002, - EFREET_DESKTOP_EXEC_FLAG_DIR = 0x0004, - EFREET_DESKTOP_EXEC_FLAG_FILE = 0x0008 + EFREET_DESKTOP_EXEC_FLAG_URI = 0x0002 } Efreet_Desktop_Command_Flag; /**