summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-19 18:33:17 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-19 18:37:52 +0100
commit11c0fb01bd891b95931c30dae1d253246064669c (patch)
tree15783f046f43027d58c0567f35f192700696178c /src/modules
parent1783c328394ffe1743522cab4d904a226ac7574c (diff)
pager/desks - stop using numeric N,M if no name is set - be blank
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/conf_display/e_int_config_desk.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/modules/conf_display/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c
index 274ac9b..313ccc4 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
55_fill_data(E_Config_Dialog_Data *cfdata) 55_fill_data(E_Config_Dialog_Data *cfdata)
56{ 56{
57 Eina_List *l; 57 Eina_List *l;
58 char name[1024];
59 int ok = 0; 58 int ok = 0;
60 59
61 cfdata->bg = e_bg_file_get(cfdata->zone_num, cfdata->desk_x, cfdata->desk_y); 60 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)
75 ok = 1; 74 ok = 1;
76 break; 75 break;
77 } 76 }
78 if (!ok) 77 if (!ok) cfdata->name = strdup("");
79 {
80 snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y);
81 cfdata->name = strdup(name);
82 }
83} 78}
84 79
85static void * 80static void *
@@ -106,13 +101,10 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
106static int 101static int
107_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 102_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
108{ 103{
109 char name[40];
110
111 if ((!cfdata->name) || (!cfdata->name[0])) 104 if ((!cfdata->name) || (!cfdata->name[0]))
112 { 105 {
113 snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y);
114 free(cfdata->name); 106 free(cfdata->name);
115 cfdata->name = strdup(name); 107 cfdata->name = strdup("");
116 } 108 }
117 109
118 e_desk_name_del(cfdata->zone_num, 110 e_desk_name_del(cfdata->zone_num,