[EGIT] [e16/e16] master 03/05: Use border name wrapper function some more

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=2dad8c5f29ba7e445032730c397c175327cc775a

commit 2dad8c5f29ba7e445032730c397c175327cc775a
Author: Kim Woelders <k...@woelders.dk>
Date:   Thu Jun 6 22:26:28 2013 +0200

    Use border name wrapper function some more
---
 src/hints.c      |  4 ++--
 src/menus-misc.c | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/hints.c b/src/hints.c
index 2370c070..406f3403 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2015 Kim Woelders
+ * Copyright (C) 2003-2020 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -385,7 +385,7 @@ EHintsSetInfo(const EWin * ewin)
                             (unsigned int *)c, ENL_DATA_ITEMS);
 
    ex_window_prop_string_set(EwinGetClientXwin(ewin), E16_ATOM_WIN_BORDER,
-                            ewin->normal_border->name);
+                            BorderGetName(ewin->normal_border));
 
    if (EDebug(EDBUG_TYPE_SNAPS))
       Eprintf("Snap set einf  %#x: %4d+%4d %4dx%4d: %s\n",
diff --git a/src/menus-misc.c b/src/menus-misc.c
index e6c93c2a..2546aefc 100644
--- a/src/menus-misc.c
+++ b/src/menus-misc.c
@@ -458,6 +458,7 @@ MenuCreateFromBorders(const char *name, MenuStyle * ms)
    Border            **lst;
    int                 i, num;
    MenuItem           *mi;
+   const char         *bname;
 
    m = MenuCreate(name, _("Border"), NULL, ms);
 
@@ -467,13 +468,13 @@ MenuCreateFromBorders(const char *name, MenuStyle * ms)
 
    for (i = 0; i < num; i++)
      {
+       bname = BorderGetName(lst[i]);
+       if (*bname == '_')
+          continue;
        /* if its not internal (ie doesnt start with _ ) */
-       if (lst[i]->name[0] != '_')
-         {
-            Esnprintf(s, sizeof(s), "wop * bo %s", lst[i]->name);
-            mi = MenuItemCreate(lst[i]->name, NULL, s, NULL);
-            MenuAddItem(m, mi);
-         }
+       Esnprintf(s, sizeof(s), "wop * bo %s", bname);
+       mi = MenuItemCreate(bname, NULL, s, NULL);
+       MenuAddItem(m, mi);
      }
    Efree(lst);
 

--