Menu
▾
▴
E SVN: englebass IN trunk/e/src: bin modules/exebuf modules/fileman modules/ibar modules/illume modules/illume-home modules/illume-keyboard modules/systray modules/wizard
|
From: Enlightenment S. <no-...@en...> - 2010-01-30 22:11:18
|
Log:
Ecore_Str.h -> Eina
Author: englebass
Date: 2010-01-30 14:11:11 -0800 (Sat, 30 Jan 2010)
New Revision: 45740
Modified:
trunk/e/src/bin/e.h trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_config.c trunk/e/src/bin/e_desklock.c trunk/e/src/bin/e_eap_editor.c trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm_mime.c trunk/e/src/bin/e_int_border_menu.c trunk/e/src/bin/e_prefix.c trunk/e/src/bin/e_theme.c trunk/e/src/bin/e_user.c trunk/e/src/modules/exebuf/e_exebuf.c trunk/e/src/modules/fileman/e_fwin.c trunk/e/src/modules/ibar/e_mod_config.c trunk/e/src/modules/ibar/e_mod_main.c trunk/e/src/modules/illume-home/e_mod_main.c trunk/e/src/modules/illume-keyboard/e_kbd_int.c trunk/e/src/modules/illume/e_kbd_int.c trunk/e/src/modules/illume/e_mod_win.c trunk/e/src/modules/systray/e_mod_main.c trunk/e/src/modules/wizard/page_030.c
Modified: trunk/e/src/bin/e.h
===================================================================
--- trunk/e/src/bin/e.h 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e.h 2010-01-30 22:11:11 UTC (rev 45740)
@@ -80,7 +80,6 @@
#include <Evas.h>
#include <Evas_Engine_Buffer.h>
#include <Ecore.h>
-#include <Ecore_Str.h>
#include <Ecore_X.h>
#include <Ecore_X_Atoms.h>
#include <Ecore_X_Cursor.h>
Modified: trunk/e/src/bin/e_actions.c
===================================================================
--- trunk/e/src/bin/e_actions.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_actions.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -2387,13 +2387,13 @@
const char *action, *params;
a1 = alloca(a1stop - a1start + 1);
- ecore_strlcpy(a1, a1start, a1stop - a1start + 1);
+ eina_strlcpy(a1, a1start, a1stop - a1start + 1);
action = NULL;
params = NULL;
_delayed_action_list_parse_action(a1, &delay, &da->def.action, &da->def.params);
a2 = alloca(a1stop - a1start + 1);
- ecore_strlcpy(a2, a2start, a2stop - a2start + 1);
+ eina_strlcpy(a2, a2start, a2stop - a2start + 1);
_delayed_action_list_parse_action(a2, &delay, &da->delayed.action, &da->delayed.params);
}
da->timer = ecore_timer_add(delay, _delayed_action_cb_timer, da);
Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_config.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -1230,7 +1230,7 @@
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
EINA_LIST_FREE(files, file)
{
- if (ecore_strlcpy(p, file, len) >= len)
+ if (eina_strlcpy(p, file, len) >= len)
{
free(file);
continue;
@@ -1258,7 +1258,7 @@
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
EINA_LIST_FREE(files, file)
{
- if (ecore_strlcpy(p, file, len) >= len)
+ if (eina_strlcpy(p, file, len) >= len)
{
free(file);
continue;
@@ -1448,7 +1448,7 @@
buf[len] = '/';
len++;
- len2 = ecore_strlcpy(buf + len, domain, sizeof(buf) - len);
+ len2 = eina_strlcpy(buf + len, domain, sizeof(buf) - len);
if (len2 + sizeof(".cfg") >= sizeof(buf) - len) return 0;
len += len2;
Modified: trunk/e/src/bin/e_desklock.c
===================================================================
--- trunk/e/src/bin/e_desklock.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_desklock.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -736,8 +736,8 @@
sigaction(SIGABRT, &action, NULL);
current_user = _desklock_auth_get_current_user();
- ecore_strlcpy(da.user, current_user, PATH_MAX);
- ecore_strlcpy(da.passwd, passwd, PATH_MAX);
+ eina_strlcpy(da.user, current_user, PATH_MAX);
+ eina_strlcpy(da.passwd, passwd, PATH_MAX);
/* security - null out passwd string once we are done with it */
for (p = passwd; *p; p++) *p = 0;
da.pam.handle = NULL;
Modified: trunk/e/src/bin/e_eap_editor.c
===================================================================
--- trunk/e/src/bin/e_eap_editor.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_eap_editor.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -414,7 +414,7 @@
basename[i] = '\0';
}
else
- ecore_strlcpy(basename, "unnamed_desktop", sizeof(basename));
+ eina_strlcpy(basename, "unnamed_desktop", sizeof(basename));
i = 0;
snprintf(path, sizeof(path), "%s/applications/%s.desktop",
Modified: trunk/e/src/bin/e_fm.c
===================================================================
--- trunk/e/src/bin/e_fm.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_fm.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -1560,7 +1560,7 @@
if (!evas_object_type_get(obj)) return; // safety
if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety
- bufused = ecore_strlcpy(buf, sd->realpath, sizeof(buf));
+ bufused = eina_strlcpy(buf, sd->realpath, sizeof(buf));
if (bufused >= sizeof(buf) - 2)
return;
@@ -1584,7 +1584,7 @@
if (_e_fm2_file_is_desktop(ic->info.file))
_e_fm2_icon_desktop_load(ic);
- if (ecore_strlcpy(pfile, ic->info.file, buffree) >= buffree)
+ if (eina_strlcpy(pfile, ic->info.file, buffree) >= buffree)
continue;
cf = e_fm2_custom_file_get(buf);
@@ -3160,7 +3160,7 @@
{
if (dev[1] == '\0')
{
- if (ecore_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
+ if (eina_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
return NULL;
}
else
@@ -3241,7 +3241,7 @@
if (buf[0] == '\0')
{
- if (ecore_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
+ if (eina_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
return NULL;
}
@@ -3398,7 +3398,7 @@
realpath = e_fm2_real_path_get(obj);
if (!realpath) return 0;
- bufused = ecore_strlcpy(buf, realpath, sizeof(buf));
+ bufused = eina_strlcpy(buf, realpath, sizeof(buf));
if (bufused >= sizeof(buf) - 2) return 0;
if ((bufused > 0) && (buf[bufused - 1] != '/'))
@@ -3414,7 +3414,7 @@
EINA_LIST_FREE(sel, ici)
{
if (!ici) continue;
- if (ecore_strlcpy(pfile, ici->file, buffree) >= buffree) continue;
+ if (eina_strlcpy(pfile, ici->file, buffree) >= buffree) continue;
_e_fm_file_buffer = eina_list_append(_e_fm_file_buffer, _e_fm2_uri_escape(buf));
}
@@ -4750,7 +4750,7 @@
* also be fuzzy - up to 4 chars of extn is ok - eg .html but 5 or
* more is considered part of the name
*/
- ecore_strlcpy(buf, ic->info.file, sizeof(buf));
+ eina_strlcpy(buf, ic->info.file, sizeof(buf));
len = strlen(buf);
p = strrchr(buf, '.');
@@ -6664,7 +6664,7 @@
ic->drag.start = 0;
evas_object_geometry_get(ic->obj, &x, &y, &w, &h);
realpath = e_fm2_real_path_get(ic->sd->obj);
- p_offset = ecore_strlcpy(buf, realpath, sizeof(buf));
+ p_offset = eina_strlcpy(buf, realpath, sizeof(buf));
if ((p_offset < 1) || (p_offset >= sizeof(buf) - 2)) return;
if (buf[p_offset - 1] != '/')
{
@@ -6681,7 +6681,7 @@
const char *s;
int s_len;
- if (ecore_strlcpy(p, ici->file, p_length) >= p_length) continue;
+ if (eina_strlcpy(p, ici->file, p_length) >= p_length) continue;
s = _e_fm2_uri_escape(buf);
if (!s) continue;
s_len = strlen(s);
@@ -7316,8 +7316,8 @@
}
else
*/ {
- ecore_strlcpy(buf1, l1, sizeof(buf1));
- ecore_strlcpy(buf2, l2, sizeof(buf2));
+ eina_strlcpy(buf1, l1, sizeof(buf1));
+ eina_strlcpy(buf2, l2, sizeof(buf2));
}
p = buf1;
while (*p)
Modified: trunk/e/src/bin/e_fm_mime.c
===================================================================
--- trunk/e/src/bin/e_fm_mime.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_fm_mime.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -48,7 +48,7 @@
val = eina_hash_find(icon_map, mime);
if (val) return val;
- ecore_strlcpy(buf2, mime, sizeof(buf2));
+ eina_strlcpy(buf2, mime, sizeof(buf2));
val = strchr(buf2, '/');
if (val) *val = 0;
@@ -57,7 +57,7 @@
{
if (e_util_glob_match(mi->mime, mime))
{
- ecore_strlcpy(buf, mi->icon, sizeof(buf));
+ eina_strlcpy(buf, mi->icon, sizeof(buf));
goto ok;
}
}
@@ -87,12 +87,12 @@
/* 3. look up icon in theme */
try_theme:
memcpy(buf, "e/icons/fileman/mime/", sizeof("e/icons/fileman/mime/") - 1);
- ecore_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, mime,
+ eina_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, mime,
sizeof(buf) - (sizeof("e/icons/fileman/mime/") - 1));
val = (char *)e_theme_edje_file_get("base/theme/fileman", buf);
if ((val) && (e_util_edje_collection_exists(val, buf))) goto ok;
- ecore_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, buf2,
+ eina_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, buf2,
sizeof(buf) - (sizeof("e/icons/fileman/mime/") - 1));
val = (char *)e_theme_edje_file_get("base/theme/fileman", buf);
if ((val) && (e_util_edje_collection_exists(val, buf))) goto ok;
Modified: trunk/e/src/bin/e_int_border_menu.c
===================================================================
--- trunk/e/src/bin/e_int_border_menu.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_int_border_menu.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -1196,7 +1196,7 @@
if (file[0] == '.') continue;
- ecore_strlcpy(buf + len, file, sizeof(buf) - len);
+ eina_strlcpy(buf + len, file, sizeof(buf) - len);
if (ecore_file_is_dir(buf))
{
smi = e_menu_item_new(sm);
Modified: trunk/e/src/bin/e_prefix.c
===================================================================
--- trunk/e/src/bin/e_prefix.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_prefix.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -112,7 +112,7 @@
_prefix_path = malloc(p - _exe_path + 1);
if (_prefix_path)
{
- ecore_strlcpy(_prefix_path, _exe_path, p - _exe_path + 1);
+ eina_strlcpy(_prefix_path, _exe_path, p - _exe_path + 1);
/* bin and lib always together */
snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
@@ -261,7 +261,7 @@
{
/* path is ok - magic file found */
_prefix_path_data = strdup(buf2);
- _prefix_path_data_len = ecore_strlcpy(buf, buf2, sizeof(buf));
+ _prefix_path_data_len = eina_strlcpy(buf, buf2, sizeof(buf));
p = strrchr(buf, '/');
if (p) *p = 0;
snprintf(buf2, sizeof(buf2), "%s/locale", buf);
@@ -285,7 +285,7 @@
Eina_List *files;
Eina_List *l;
- ecore_strlcpy(buf, _prefix_path, sizeof(buf));
+ eina_strlcpy(buf, _prefix_path, sizeof(buf));
p = strrchr(buf, '/');
if (p) *p = 0;
files = ecore_file_ls(buf);
@@ -318,7 +318,7 @@
*/
if (!_prefix_path_data)
{
- ecore_strlcpy(buf, _prefix_path, sizeof(buf));
+ eina_strlcpy(buf, _prefix_path, sizeof(buf));
p = strrchr(buf, '/');
if (p) *p = 0;
snprintf(buf2, sizeof(buf2), "%s/"MAGIC_DAT, buf);
@@ -521,7 +521,7 @@
size_t
e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len)
{
- return ecore_str_join_len(dst, size, '/', _prefix_path_data, _prefix_path_data_len, path, path_len);
+ return eina_str_join_len(dst, size, '/', _prefix_path_data, _prefix_path_data_len, path, path_len);
}
size_t
Modified: trunk/e/src/bin/e_theme.c
===================================================================
--- trunk/e/src/bin/e_theme.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_theme.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -155,7 +155,7 @@
}
}
/* no mapping or set failed - fall back */
- ecore_strlcpy(buf, category, sizeof(buf));
+ eina_strlcpy(buf, category, sizeof(buf));
/* shorten string up to and not including last / char */
p = strrchr(buf, '/');
if (p) *p = 0;
@@ -237,7 +237,7 @@
}
}
/* no mapping or set failed - fall back */
- ecore_strlcpy(buf, category, sizeof(buf));
+ eina_strlcpy(buf, category, sizeof(buf));
/* shorten string up to and not including last / char */
p = strrchr(buf, '/');
if (p) *p = 0;
Modified: trunk/e/src/bin/e_user.c
===================================================================
--- trunk/e/src/bin/e_user.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/bin/e_user.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -46,7 +46,7 @@
if (!_e_user_homedir)
e_user_homedir_get();
- return ecore_str_join_len(dst, size, '/', _e_user_homedir, _e_user_homedir_len, path, path_len);
+ return eina_str_join_len(dst, size, '/', _e_user_homedir, _e_user_homedir_len, path, path_len);
}
EAPI size_t
@@ -156,7 +156,7 @@
if (!_e_user_dir)
e_user_dir_get();
- return ecore_str_join_len(dst, size, '/', _e_user_dir, _e_user_dir_len, path, path_len);
+ return eina_str_join_len(dst, size, '/', _e_user_dir, _e_user_dir_len, path, path_len);
}
EAPI size_t
Modified: trunk/e/src/modules/exebuf/e_exebuf.c
===================================================================
--- trunk/e/src/modules/exebuf/e_exebuf.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/exebuf/e_exebuf.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -752,13 +752,13 @@
exe = ecore_file_app_exe_get(exe_sel->desktop->exec);
if (exe)
{
- ecore_strlcpy(cmd_buf, exe, EXEBUFLEN);
+ eina_strlcpy(cmd_buf, exe, EXEBUFLEN);
free(exe);
}
}
else if (exe_sel->file)
{
- ecore_strlcpy(cmd_buf, exe_sel->file, EXEBUFLEN);
+ eina_strlcpy(cmd_buf, exe_sel->file, EXEBUFLEN);
}
}
else
@@ -797,7 +797,7 @@
}
if ((exe) && (orig_len < common_len) && (common_len < (EXEBUFLEN - 1)))
{
- ecore_strlcpy(cmd_buf, exe, common_len + 1);
+ eina_strlcpy(cmd_buf, exe, common_len + 1);
}
if (clear_hist)
_e_exebuf_hist_clear();
Modified: trunk/e/src/modules/fileman/e_fwin.c
===================================================================
--- trunk/e/src/modules/fileman/e_fwin.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/fileman/e_fwin.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -709,7 +709,7 @@
if (ext == E_FWIN_EXEC_NONE)
{
if (!((ici->link) && (ici->mount)))
- ecore_strlcpy(buf, ici->file, sizeof(buf));
+ eina_strlcpy(buf, ici->file, sizeof(buf));
}
else
_e_fwin_file_exec(page, ici, ext);
@@ -938,7 +938,7 @@
if (file)
{
- ecore_strlcpy(buf, file, sizeof(buf));
+ eina_strlcpy(buf, file, sizeof(buf));
e_win_title_set(page->fwin->win, buf);
}
}
Modified: trunk/e/src/modules/ibar/e_mod_config.c
===================================================================
--- trunk/e/src/modules/ibar/e_mod_config.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/ibar/e_mod_config.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -279,7 +279,7 @@
EINA_LIST_FREE(dirs, file)
{
if (file[0] == '.') continue;
- if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+ if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
if (ecore_file_is_dir(buf))
{
Modified: trunk/e/src/modules/ibar/e_mod_main.c
===================================================================
--- trunk/e/src/modules/ibar/e_mod_main.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/ibar/e_mod_main.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -272,7 +272,7 @@
e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order",
inst->ci->dir);
else
- ecore_strlcpy(buf, inst->ci->dir, sizeof(buf));
+ eina_strlcpy(buf, inst->ci->dir, sizeof(buf));
b->apps = e_order_new(buf);
e_order_update_callback_set(b->apps, _ibar_cb_app_change, b);
_ibar_fill(b);
@@ -491,7 +491,7 @@
e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order",
inst->ci->dir);
else
- ecore_strlcpy(buf, inst->ci->dir, sizeof(buf));
+ eina_strlcpy(buf, inst->ci->dir, sizeof(buf));
inst->ibar->apps = e_order_new(buf);
_ibar_fill(inst->ibar);
_ibar_resize_handle(inst->ibar);
Modified: trunk/e/src/modules/illume/e_kbd_int.c
===================================================================
--- trunk/e/src/modules/illume/e_kbd_int.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/illume/e_kbd_int.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -1113,7 +1113,7 @@
p = strrchr(file, '.');
if ((p) && (!strcmp(p, ".kbd")))
{
- if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+ if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
}
@@ -1144,7 +1144,7 @@
}
if (ok)
{
- if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+ if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
}
Modified: trunk/e/src/modules/illume/e_mod_win.c
===================================================================
--- trunk/e/src/modules/illume/e_mod_win.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/illume/e_mod_win.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -622,7 +622,7 @@
exename = malloc(p - desktop->exec + 1);
if (exename)
{
- ecore_strlcpy(exename, desktop->exec, p - desktop->exec + 1);
+ eina_strlcpy(exename, desktop->exec, p - desktop->exec + 1);
}
}
if (exename)
@@ -972,7 +972,7 @@
EINA_LIST_FREE(files, file)
{
- if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+ if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
ecore_file_unlink(buf);
free(file);
Modified: trunk/e/src/modules/illume-home/e_mod_main.c
===================================================================
--- trunk/e/src/modules/illume-home/e_mod_main.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/illume-home/e_mod_main.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -555,7 +555,7 @@
EINA_LIST_FREE(files, file)
{
- if (ecore_strlcpy(buff + len, file, sizeof(buff) - len) >= sizeof(buff) - len)
+ if (eina_strlcpy(buff + len, file, sizeof(buff) - len) >= sizeof(buff) - len)
continue;
ecore_file_unlink(buff);
free(file);
@@ -700,7 +700,7 @@
else
{
exe = malloc(p - desktop->exec + 1);
- if (exe) ecore_strlcpy(exe, desktop->exec, p - desktop->exec + 1);
+ if (exe) eina_strlcpy(exe, desktop->exec, p - desktop->exec + 1);
}
if (exe)
{
Modified: trunk/e/src/modules/illume-keyboard/e_kbd_int.c
===================================================================
--- trunk/e/src/modules/illume-keyboard/e_kbd_int.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/illume-keyboard/e_kbd_int.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -1073,7 +1073,7 @@
p = strrchr(file, '.');
if ((p) && (!strcmp(p, ".kbd")))
{
- if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+ if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
}
@@ -1104,7 +1104,7 @@
}
if (ok)
{
- if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+ if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue;
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
}
Modified: trunk/e/src/modules/systray/e_mod_main.c
===================================================================
--- trunk/e/src/modules/systray/e_mod_main.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/systray/e_mod_main.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -816,7 +816,7 @@
char buf[128], *p;
size_t len, avail;
- len = ecore_strlcpy(buf, _group_gadget, sizeof(buf));
+ len = eina_strlcpy(buf, _group_gadget, sizeof(buf));
if (len >= sizeof(buf))
goto fallback;
p = buf + len;
@@ -835,7 +835,7 @@
if (shelf_style)
{
size_t r;
- r = ecore_strlcpy(p, shelf_style, avail);
+ r = eina_strlcpy(p, shelf_style, avail);
if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
return;
}
@@ -843,7 +843,7 @@
if (gc_style)
{
size_t r;
- r = ecore_strlcpy(p, gc_style, avail);
+ r = eina_strlcpy(p, gc_style, avail);
if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
return;
}
@@ -862,7 +862,7 @@
if (shelf_style)
{
size_t r;
- r = ecore_strlcpy(p, shelf_style, avail);
+ r = eina_strlcpy(p, shelf_style, avail);
if (r < avail && edje_object_file_set(o, path, buf))
return;
}
@@ -870,7 +870,7 @@
if (gc_style)
{
size_t r;
- r = ecore_strlcpy(p, gc_style, avail);
+ r = eina_strlcpy(p, gc_style, avail);
if (r < avail && edje_object_file_set(o, path, buf))
return;
}
Modified: trunk/e/src/modules/wizard/page_030.c
===================================================================
--- trunk/e/src/modules/wizard/page_030.c 2010-01-30 22:02:08 UTC (rev 45739)
+++ trunk/e/src/modules/wizard/page_030.c 2010-01-30 22:11:11 UTC (rev 45740)
@@ -137,7 +137,7 @@
tlabel = malloc(p2 - p + 1);
if (tlabel)
{
- ecore_strlcpy(tlabel, p, p2 - p + 1);
+ eina_strlcpy(tlabel, p, p2 - p + 1);
tlabel[0] = toupper(tlabel[0]);
if (*p2 == '-')
{
@@ -148,7 +148,7 @@
tdesc = malloc(p - p2 + 1);
if (tdesc)
{
- ecore_strlcpy(tdesc, p2, p - p2 + 1);
+ eina_strlcpy(tdesc, p2, p - p2 + 1);
tdesc[0] = toupper(tdesc[0]);
snprintf(buf, sizeof(buf), "%s (%s)", tlabel, tdesc);
}
|