From 11c0fb01bd891b95931c30dae1d253246064669c Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Thu, 19 Sep 2019 18:33:17 +0100
Subject: [PATCH] pager/desks - stop using numeric N,M if no name is set - be
 blank

---
 TODO                                         |  5 ++---
 src/bin/e_desk.c                             | 12 ++----------
 src/modules/conf_display/e_int_config_desk.c | 12 ++----------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/TODO b/TODO
index b9adc84e8..12be817cc 100644
--- a/TODO
+++ b/TODO
@@ -150,7 +150,6 @@ TODO:
 * pager: add "Set desktop name" on right click on desktop in pager
   * turn on desktop names when setting one here
 * pager: add "Set wallpaper" on right clikc on desktop in pager
-* pager: only show desktop names set and not 0,0 0,1 etc.
 * start: start menu could do with more featured content
   * like you see on windows for example (search and multiple columns etc.)
   * a touch screen android-style scrolling fullscreen app icon style
@@ -186,8 +185,8 @@ TODO:
   screen migrated to has diffrent res
 * randr: when losing a zone/screen, put windows in purgatory and then have
   purgatory screens available via pager to drag onto a current screen,
-  or the specific virtual desktops from purgator to be accessible evenm
-if not on a real screen/zone
+  or the specific virtual desktops from purgator to be accessible even
+  if not on a real screen/zone
 * device manager: new tool to browser /sys etc. and display nicely present
   hardware and device drivers and state
 * sys top: new tool displays cpu/mem "top" - evisum. we want it to be shipped
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 1ea09647c..dd2b10738 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -118,11 +118,7 @@ e_desk_new(E_Zone *zone, int x, int y)
         break;
      }
 
-   if (!ok)
-     {
-        snprintf(name, sizeof(name), "%d,%d", x, y);
-        desk->name = eina_stringshare_add(name);
-     }
+   if (!ok) desk->name = eina_stringshare_add("");
 
    /* Get window profile name for current desktop */
    if (zone->randr2_id)
@@ -231,11 +227,7 @@ e_desk_name_update(void)
                        break;
                     }
 
-                  if (!ok)
-                    {
-                       snprintf(name, sizeof(name), "%d,%d", d_x, d_y);
-                       e_desk_name_set(desk, name);
-                    }
+                  if (!ok) e_desk_name_set(desk, "");
                }
           }
      }
diff --git a/src/modules/conf_display/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c
index 274ac9b62..313ccc4a5 100644
--- a/src/modules/conf_display/e_int_config_desk.c
+++ b/src/modules/conf_display/e_int_config_desk.c
@@ -55,7 +55,6 @@ static void
 _fill_data(E_Config_Dialog_Data *cfdata)
 {
    Eina_List *l;
-   char name[1024];
    int ok = 0;
 
    cfdata->bg = e_bg_file_get(cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
@@ -75,11 +74,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
         ok = 1;
         break;
      }
-   if (!ok)
-     {
-        snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y);
-        cfdata->name = strdup(name);
-     }
+   if (!ok) cfdata->name = strdup("");
 }
 
 static void *
@@ -106,13 +101,10 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 static int
 _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
-   char name[40];
-
    if ((!cfdata->name) || (!cfdata->name[0]))
      {
-        snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y);
         free(cfdata->name);
-        cfdata->name = strdup(name);
+        cfdata->name = strdup("");
      }
 
    e_desk_name_del(cfdata->zone_num,