From c5b3aba6fd399b0863d4e31a6ae0c2f8da09dc9d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 6 Jan 2017 12:56:22 -0500 Subject: [PATCH] specify format string for desk names in desk config -Wformat=2 --- src/bin/e_desk.c | 4 ++-- src/modules/conf_display/e_int_config_desk.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index 68d32a0f4..3a956834c 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -119,7 +119,7 @@ e_desk_new(E_Zone *zone, int x, int y) if (!ok) { - snprintf(name, sizeof(name), _(e_config->desktop_default_name), x, y); + snprintf(name, sizeof(name), "%s: %d,%d", _(e_config->desktop_default_name), x, y); desk->name = eina_stringshare_add(name); } @@ -232,7 +232,7 @@ e_desk_name_update(void) if (!ok) { - snprintf(name, sizeof(name), + snprintf(name, sizeof(name), "%s: %d,%d", _(e_config->desktop_default_name), d_x, d_y); e_desk_name_set(desk, name); diff --git a/src/modules/conf_display/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c index 1562061d5..832959b52 100644 --- a/src/modules/conf_display/e_int_config_desk.c +++ b/src/modules/conf_display/e_int_config_desk.c @@ -55,7 +55,7 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { Eina_List *l; - char name[40]; + char name[1024]; int ok = 0; cfdata->bg = e_bg_file_get(cfdata->zone_num, cfdata->desk_x, cfdata->desk_y); @@ -77,7 +77,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } if (!ok) { - snprintf(name, sizeof(name), _(e_config->desktop_default_name), cfdata->desk_x, cfdata->desk_y); + snprintf(name, sizeof(name), "%s: %d,%d", _(e_config->desktop_default_name), cfdata->desk_x, cfdata->desk_y); cfdata->name = strdup(name); } } @@ -110,7 +110,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) if ((!cfdata->name) || (!cfdata->name[0])) { - snprintf(name, sizeof(name), _(e_config->desktop_default_name), + snprintf(name, sizeof(name), "%s: %d,%d", _(e_config->desktop_default_name), cfdata->desk_x, cfdata->desk_y); free(cfdata->name); cfdata->name = strdup(name);