This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efm2.
View the commit online.
commit 06e6bdf66dd0ffd7e68f6f06b4350597d55959b9
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Fri Jun 20 19:32:14 2025 +0100
clean up new shared desktop field getter
---
src/backends/default/open.c | 43 ++++++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/backends/default/open.c b/src/backends/default/open.c
index 5953908..393a15a 100644
--- a/src/backends/default/open.c
+++ b/src/backends/default/open.c
@@ -18,6 +18,7 @@
#include <grp.h>
#include "cmd.h"
+#include "eina_types.h"
#include "sha.h"
#include "meta.h"
#include "thumb_check.h"
@@ -704,9 +705,6 @@ _file_add_mod_desktop_fields_append(Eina_Strbuf *strbuf, Efreet_Desktop *d,
#define KEYSTR() eina_strbuf_string_get(keybuf)
#define STREMPTY(_x) (_x) ? (_x) : ""
#define STRBOOL(_x) (_x) ? "true" : "false"
- KEY("label");
- cmd_strbuf_append(strbuf, KEYSTR(),
- d->name ? d->name : ecore_file_file_get(path));
KEY("desktop-type");
if (d->type == EFREET_DESKTOP_TYPE_APPLICATION)
cmd_strbuf_append(strbuf, KEYSTR(), "Application");
@@ -714,10 +712,24 @@ _file_add_mod_desktop_fields_append(Eina_Strbuf *strbuf, Efreet_Desktop *d,
cmd_strbuf_append(strbuf, KEYSTR(), "Directory");
else if (d->type == EFREET_DESKTOP_TYPE_LINK)
cmd_strbuf_append(strbuf, KEYSTR(), "Link");
+ KEY("desktop-enlightenment-type");
+ _cmd_desktop_x_field_append(strbuf, d, KEYSTR(),
+ "X-Enlightenment-Type");
+
+ KEY("label");
+ cmd_strbuf_append(strbuf, KEYSTR(),d->name ? d->name : ecore_file_file_get(path));
+ KEY("label-clicked");
+ _cmd_desktop_x_field_append(strbuf, d, KEYSTR(),
+ "X-NameClicked");
+ KEY("label-selected");
+ _cmd_desktop_x_field_append(strbuf, d, KEYSTR(),
+ "X-NameSelected");
+
KEY("desktop-generic-name");
cmd_strbuf_append(strbuf, KEYSTR(), STREMPTY(d->generic_name));
KEY("dsesktop-comment");
cmd_strbuf_append(strbuf, KEYSTR(), STREMPTY(d->comment));
+
KEY("desktop-icon");
icf = _icon_resolve(path, d->icon, st);
if (icf)
@@ -726,9 +738,15 @@ _file_add_mod_desktop_fields_append(Eina_Strbuf *strbuf, Efreet_Desktop *d,
free(icf);
}
else cmd_strbuf_append(strbuf, KEYSTR(), STREMPTY(d->icon));
+ KEY("desktop-icon-clicked");
+ _cmd_desktop_x_field_icon_resolve_append(strbuf, d, KEYSTR(),
+ "X-IconClicked", path, st);
+ KEY("desktop-icon-selected");
+ _cmd_desktop_x_field_icon_resolve_append(strbuf, d, KEYSTR(),
+ "X-IconSelected", path, st);
+
KEY("desktop-try-exec");
cmd_strbuf_append(strbuf, KEYSTR(), STREMPTY(d->try_exec));
-
KEY("desktop-exec");
cmd_strbuf_append(strbuf, KEYSTR(), STREMPTY(d->exec));
KEY("desktop-url");
@@ -747,21 +765,6 @@ _file_add_mod_desktop_fields_append(Eina_Strbuf *strbuf, Efreet_Desktop *d,
icon = efreet_mime_type_icon_get(d->icon, icon_theme, 128);
cmd_strbuf_append(strbuf, KEYSTR(), STREMPTY(icon));
}
- KEY("label-clicked");
- _cmd_desktop_x_field_append(strbuf, d, KEYSTR(),
- "X-NameClicked");
- KEY("label-selected");
- _cmd_desktop_x_field_append(strbuf, d, KEYSTR(),
- "X-NameSelected");
- KEY("desktop-icon-clicked");
- _cmd_desktop_x_field_icon_resolve_append(
- strbuf, d, KEYSTR(), "X-IconClicked", path, st);
- KEY("desktop-icon-selected");
- _cmd_desktop_x_field_icon_resolve_append(
- strbuf, d, KEYSTR(), "X-IconSelected", path, st);
- KEY("desktop-enlightenment-type");
- _cmd_desktop_x_field_icon_resolve_append(strbuf, d, KEYSTR(),
- "X-Enlightenment-Type", path, st);
#undef STREMPTY
#undef KEYSTR
#undef KEY
@@ -837,6 +840,7 @@ _file_add_mod_info(Eina_Strbuf *strbuf, const char *path, Eina_Bool delay)
_file_add_mod_desktop_fields_append(
strbuf, desktop, "link-", path, &stdst);
efreet_desktop_free(desktop);
+ have_label = EINA_TRUE;
}
else
cmd_strbuf_append(strbuf, "link-label",
@@ -953,6 +957,7 @@ _file_add_mod_info(Eina_Strbuf *strbuf, const char *path, Eina_Bool delay)
_file_add_mod_desktop_fields_append(strbuf, desktop, NULL, path,
&st);
efreet_desktop_free(desktop);
+ have_label = EINA_TRUE;
}
else if (!have_label)
cmd_strbuf_append(strbuf, "label", ecore_file_file_get(path));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
