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 bdca585dd1196d55984be3382222bdea19ac11d0
Author: Carsten Haitzler (Rasterman) <[email protected]>
AuthorDate: Tue Mar 31 22:13:23 2026 +0100
make modification of properties easier to read with macros
---
src/backends/default/open.c | 3 +-
src/efm/efm_back_end.c | 136 ++++++++++++++++++++++++--------------------
2 files changed, 75 insertions(+), 64 deletions(-)
diff --git a/src/backends/default/open.c b/src/backends/default/open.c
index 8f0415c..746e58d 100644
--- a/src/backends/default/open.c
+++ b/src/backends/default/open.c
@@ -1701,7 +1701,8 @@ do_handle_cmd(Cmd *c)
// cmd_dump_sterr(c);
}
-int do_init(int argc EINA_UNUSED, const char **argv EINA_UNUSED)
+int
+do_init(int argc EINA_UNUSED, const char **argv EINA_UNUSED)
{
const char *s;
diff --git a/src/efm/efm_back_end.c b/src/efm/efm_back_end.c
index fac4f8f..f6d601d 100644
--- a/src/efm/efm_back_end.c
+++ b/src/efm/efm_back_end.c
@@ -352,72 +352,78 @@ _icon_add_mod_props_get(Icon *icon, Cmd *c, const char *label)
Eina_Bool recalc = EINA_FALSE, queue = EINA_FALSE;
eina_stringshare_replace(&(icon->info.label), label);
- s = cmd_key_find(c, "label-clicked");
- if (!s) s = cmd_key_find(c, "link-label-clicked");
- eina_stringshare_replace(&(icon->info.label_clicked), s);
- s = cmd_key_find(c, "label-selected");
- if (!s) s = cmd_key_find(c, "link-label-selected");
- eina_stringshare_replace(&(icon->info.label_selected), s);
- s = cmd_key_find(c, "mime");
- if (s) eina_stringshare_replace(&(icon->info.mime), s);
- s = cmd_key_find(c, "desktop-icon");
- if (!s) s = cmd_key_find(c, "link-desktop-icon");
- if (s) eina_stringshare_replace(&(icon->info.pre_lookup_icon), s);
- s = cmd_key_find(c, "desktop-icon.lookup");
- if (!s) s = cmd_key_find(c, "link-desktop-icon.lookup");
- if (!s) s = cmd_key_find(c, "icon");
- if ((s) && (s[0] == '/')) eina_stringshare_replace(&(icon->info.icon), s);
- s = cmd_key_find(c, "link-desktop-icon-clicked");
- if (!s) s = cmd_key_find(c, "desktop-icon-clicked");
- if (s) eina_stringshare_replace(&(icon->info.icon_clicked), s);
- s = cmd_key_find(c, "link-desktop-icon-selected");
- if (!s) s = cmd_key_find(c, "desktop-icon-selected");
- if (s) eina_stringshare_replace(&(icon->info.icon_selected), s);
- s = cmd_key_find(c, "link-desktop-icon-over");
- if (!s) s = cmd_key_find(c, "desktop-icon-over");
- if (s) eina_stringshare_replace(&(icon->info.icon_over), s);
- s = cmd_key_find(c, "link-desktop-icon-badge");
- if (!s) s = cmd_key_find(c, "desktop-icon-badge");
- if (s) eina_stringshare_replace(&(icon->info.icon_badge), s);
- s = cmd_key_find(c, "mime-icon");
- if (s) eina_stringshare_replace(&(icon->info.mime_icon), s);
- s = cmd_key_find(c, "thumb");
- if (s) eina_stringshare_replace(&(icon->info.thumb), s);
- s = cmd_key_find(c, "meta.icon");
- if (s) _icon_meta_override(icon, s);
- s = cmd_key_find(c, "meta.icon-clicked");
- if (s) eina_stringshare_replace(&(icon->info.icon_clicked), s);
- s = cmd_key_find(c, "meta.icon-selected");
- if (s) eina_stringshare_replace(&(icon->info.icon_selected), s);
- s = cmd_key_find(c, "meta.icon-over");
- if (s) eina_stringshare_replace(&(icon->info.icon_over), s);
- s = cmd_key_find(c, "meta.icon-badge");
- if (s) eina_stringshare_replace(&(icon->info.icon_badge), s);
- s = cmd_key_find(c, "override.mime.icon");
- if (s) _icon_meta_override(icon, s);
- s = cmd_key_find(c, "override.mime.icon-clicked");
- if (s) eina_stringshare_replace(&(icon->info.icon_clicked), s);
- s = cmd_key_find(c, "override.mine.icon-selected");
- if (s) eina_stringshare_replace(&(icon->info.icon_selected), s);
- s = cmd_key_find(c, "override.mine.icon-over");
- if (s) eina_stringshare_replace(&(icon->info.icon_over), s);
- s = cmd_key_find(c, "override.mine.icon-badge");
- if (s) eina_stringshare_replace(&(icon->info.icon_badge), s);
- s = cmd_key_find(c, "override.file.icon");
- if (s) _icon_meta_override(icon, s);
- s = cmd_key_find(c, "override.file.icon-clicked");
- if (s) eina_stringshare_replace(&(icon->info.icon_clicked), s);
- s = cmd_key_find(c, "override.file.icon-selected");
- if (s) eina_stringshare_replace(&(icon->info.icon_selected), s);
- s = cmd_key_find(c, "override.file.icon-over");
- if (s) eina_stringshare_replace(&(icon->info.icon_over), s);
- s = cmd_key_find(c, "override.file.icon-badge");
- if (s) eina_stringshare_replace(&(icon->info.icon_badge), s);
- s = cmd_key_find(c, "broken-link");
+#define FIND1(_key) s = cmd_key_find(c, (_key))
+#define FIND2(_key) if (!s) s = cmd_key_find(c, (_key))
+#define STORE1(_field) eina_stringshare_replace(&(_field), s)
+#define STORE2(_field) if (s) eina_stringshare_replace(&(_field), s)
+
+ FIND1("label-clicked");
+ FIND2("link-label-clicked");
+ STORE1(icon->info.label_clicked);
+ FIND1("label-selected");
+ FIND2("link-label-selected");
+ STORE1(icon->info.label_selected);
+ FIND1("mime");
+ STORE2(icon->info.mime);
+ FIND1("desktop-icon");
+ FIND2("link-desktop-icon");
+ STORE2(icon->info.pre_lookup_icon);
+ FIND1("desktop-icon.lookup");
+ FIND2("link-desktop-icon.lookup");
+ FIND2("icon");
+ if ((s) && (s[0] == '/')) eina_stringshare_replace(&(icon->info.icon), s);
+ FIND1("link-desktop-icon-clicked");
+ FIND2("desktop-icon-clicked");
+ STORE2(icon->info.icon_clicked);
+ FIND1("link-desktop-icon-selected");
+ FIND2("desktop-icon-selected");
+ STORE2(icon->info.icon_selected);
+ FIND1("link-desktop-icon-over");
+ FIND2("desktop-icon-over");
+ STORE2(icon->info.icon_over);
+ FIND1("link-desktop-icon-badge");
+ FIND2("desktop-icon-badge");
+ STORE2(icon->info.icon_badge);
+ FIND1("mime-icon");
+ STORE2(icon->info.mime_icon);
+ FIND1("thumb");
+ STORE2(icon->info.thumb);
+ FIND1("meta.icon");
+ if (s) _icon_meta_override(icon, s);
+ FIND1("meta.icon-clicked");
+ STORE2(icon->info.icon_clicked);
+ FIND1("meta.icon-selected");
+ STORE2(icon->info.icon_selected);
+ FIND1("meta.icon-over");
+ STORE2(icon->info.icon_over);
+ FIND1("meta.icon-badge");
+ STORE2(icon->info.icon_badge);
+ FIND1("override.mime.icon");
+ if (s) _icon_meta_override(icon, s);
+ FIND1("override.mime.icon-clicked");
+ STORE2(icon->info.icon_clicked);
+ FIND1("override.mine.icon-selected");
+ STORE2(icon->info.icon_selected);
+ FIND1("override.mine.icon-over");
+ STORE2(icon->info.icon_over);
+ FIND1("override.mine.icon-badge");
+ STORE2(icon->info.icon_badge);
+ FIND1("override.file.icon");
+ if (s) _icon_meta_override(icon, s);
+ FIND1("override.file.icon-clicked");
+ STORE2(icon->info.icon_clicked);
+ FIND1("override.file.icon-selected");
+ STORE2(icon->info.icon_selected);
+ FIND1("override.file.icon-over");
+ STORE2(icon->info.icon_over);
+ FIND1("override.file.icon-badge");
+ STORE2(icon->info.icon_badge);
+
+ FIND1("broken-link");
if ((s) && (!strcmp(s, "true"))) icon->info.broken = EINA_TRUE;
else icon->info.broken = EINA_FALSE;
- s = cmd_key_find(c, "size");
+ FIND1("size");
if (s)
{
size = atoll(s);
@@ -437,6 +443,10 @@ _icon_add_mod_props_get(Icon *icon, Cmd *c, const char *label)
if (recalc) _max_size_recalc(icon->sd);
if (queue) _size_bars_update_queue(icon->sd);
}
+#undef FIND1
+#undef FIND2
+#undef STORE1
+#undef STORE2
}
static Eina_Bool
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
