styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s/E17/E18/

This commit is contained in:
Mike Blumenkrantz 2013-06-18 15:39:53 +01:00
parent d2b7895f3d
commit 5b3408bb85
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -618,7 +618,7 @@ AC_ARG_WITH(profile,
[profile=$withval])
AC_MSG_NOTICE([Enlightenment build profile set to $profile])
EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4 -DMEDIUM_PC=5 -DFAST_PC=6"
EDJE_DEF=$EDJE_DEF" -DE17_PROFILE"=$profile
EDJE_DEF=$EDJE_DEF" -DE18_PROFILE"=$profile
AC_SUBST(EDJE_DEF)
AC_ARG_WITH(edje-cc,

12
src/bin/e_alert_main.c
View File

@ -88,7 +88,7 @@ main(int argc, char **argv)
fprintf(stderr, "exit_gdb: %i\n", exit_gdb);
tmp = getenv("E17_TAINTED");
tmp = getenv("E18_TAINTED");
if (tmp && !strcmp(tmp, "NO"))
tainted = EINA_FALSE;
@ -553,7 +553,7 @@ _e_alert_draw_text(void)
"on. We were not able to generate a backtrace, check \n"
"if your 'sysactions.conf' has an 'gdb' action line.\n"
"\n"
"Please compile latest svn E17 and EFL with\n"
"Please compile latest svn E18 and EFL with\n"
"-g and -ggdb3 in your CFLAGS.\n");
}
else if (backtrace_str)
@ -561,9 +561,9 @@ _e_alert_draw_text(void)
snprintf(msg, sizeof(msg),
"This is not meant to happen and is likely a sign of \n"
"a bug in Enlightenment or the libraries it relies \n"
"on. You will find an backtrace of E17 (%d) in :\n"
"on. You will find an backtrace of E18 (%d) in :\n"
"'%s'\n"
"Before reporting issue, compile latest E17 and EFL\n"
"Before reporting issue, compile latest E18 and EFL\n"
"from svn with '-g -ggdb3' in your CFLAGS.\n"
"You can then report this crash on :\n"
"http://trac.enlightenment.org/e/.\n",
@ -579,7 +579,7 @@ _e_alert_draw_text(void)
"recover to try and get your desktop back the way \n"
"it was.\n"
"\n"
"Please compile latest svn E17 and EFL with\n"
"Please compile latest svn E18 and EFL with\n"
"-g and -ggdb3 in your CFLAGS.\n", pid);
}
}
@ -591,7 +591,7 @@ _e_alert_draw_text(void)
"modules; before reporting this issue, please\n"
"unload them and try to see if the bug is still\n"
"there. Also update to latest svn and be sure to\n"
"compile E17 and EFL with -g and -ggdb3 in your CFLAGS");
"compile E18 and EFL with -g and -ggdb3 in your CFLAGS");
}
strcpy(warn, "");

2
src/bin/e_config.c
View File

@ -1,6 +1,6 @@
#include "e.h"
#if ((E17_PROFILE >= LOWRES_PDA) && (E17_PROFILE <= HIRES_PDA))
#if ((E18_PROFILE >= LOWRES_PDA) && (E18_PROFILE <= HIRES_PDA))
#define DEF_MENUCLICK 1.25
#else
#define DEF_MENUCLICK 0.25

4
src/bin/e_configure_option.c
View File

@ -1945,7 +1945,7 @@ e_configure_option_init(void)
OPT_ADD(BOOL, xsettings.enabled, _("Enable GTK application settings"), _("environment"), _("theme"), _("xsettings"));
co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update;
OPT_ADD(BOOL, xsettings.match_e17_theme, _("Try setting GTK theme to match E17 theme"), _("environment"), _("theme"), _("xsettings"));
OPT_ADD(BOOL, xsettings.match_e17_theme, _("Try setting GTK theme to match E18 theme"), _("environment"), _("theme"), _("xsettings"));
co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update;
OPT_ADD(STR, xsettings.net_theme_name, _("GTK theme name"), _("environment"), _("theme"), _("name"), _("xsettings"));
co->funcs[0].none = e_xsettings_config_update;
@ -1961,7 +1961,7 @@ e_configure_option_init(void)
co->thumb_cb = _e_configure_icon_theme_thumb_cb;
co->event_type = E_EVENT_CONFIG_ICON_THEME;
OPT_ICON("preferences-desktop-theme");
OPT_ADD(BOOL, icon_theme_overrides, _("Icon theme overrides E17 internal theme icons"), _("environment"), _("image"), _("theme"), _("xsettings")); //
OPT_ADD(BOOL, icon_theme_overrides, _("Icon theme overrides E18 internal theme icons"), _("environment"), _("image"), _("theme"), _("xsettings")); //
co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update;
OPT_ADD(BOOL, exe_always_single_instance, _("Always launch applications as single-instance"), _("exec"));

14
src/bin/e_gadcon.c
View File

@ -5540,7 +5540,7 @@ _e_gadcon_custom_populate_job(void *data __UNUSED__)
Eina_List *l, *ll;
E_Gadcon *gc;
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
static Eina_Bool first = EINA_TRUE;
if (first)
e_main_ts("gadcon custom populate idler start");
@ -5567,14 +5567,14 @@ _e_gadcon_custom_populate_job(void *data __UNUSED__)
_e_gadcon_event_populate(gc);
}
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
if (first)
e_main_ts("gadcon custom populate idler end");
#endif
if (!custom_populate_requests)
{
custom_populate_job = NULL;
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
first = EINA_FALSE;
#endif
}
@ -5587,7 +5587,7 @@ _e_gadcon_provider_populate_job(void *data __UNUSED__)
Eina_List *l;
E_Gadcon *gc;
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
static Eina_Bool first = EINA_TRUE;
if (first)
e_main_ts("gadcon populate idler start");
@ -5603,7 +5603,7 @@ _e_gadcon_provider_populate_job(void *data __UNUSED__)
}
EINA_LIST_FREE(gc->populate_requests, cc)
{
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
if (first) e_main_ts(cc->name);
#endif
if (gc->populate_class.func)
@ -5630,13 +5630,13 @@ _e_gadcon_provider_populate_job(void *data __UNUSED__)
if (x && _modules_loaded) _e_gadcon_event_populate(gc);
}
//out:
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
if (first)
e_main_ts("gadcon populate idler end");
#endif
populate_job = NULL;
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
first = EINA_FALSE;
#endif
}

4
src/bin/e_main.c
View File

@ -1132,7 +1132,7 @@ _e_main_shutdown(int errcode)
{
int i = 0;
printf("E17: Begin Shutdown Procedure!\n");
printf("E18: Begin Shutdown Procedure!\n");
if (_idle_before) ecore_idle_enterer_del(_idle_before);
_idle_before = NULL;
@ -1941,7 +1941,7 @@ _e_main_cb_idle_after(void *data __UNUSED__)
edje_freeze();
#ifdef E17_RELEASE_BUILD
#ifdef E18_RELEASE_BUILD
first_idle = 1;
if (first_idle)
{

4
src/bin/e_module.c
View File

@ -759,7 +759,7 @@ _e_module_cb_idler(void *data __UNUSED__)
if (name) m = e_module_new(name);
if (m)
{
#ifndef E17_RELEASE_BUILD
#ifndef E18_RELEASE_BUILD
char buf[1024];
snprintf(buf, sizeof(buf), "DELAYED MODULE LOAD: %s", name);
e_main_ts(buf);
@ -953,7 +953,7 @@ _e_module_whitelist_check(void)
ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(),
_x_tainted, &_e_tainted, 1);
e_env_set("E17_TAINTED", state);
e_env_set("E18_TAINTED", state);
}
if (eina_list_count(badl) != known)

2
src/bin/e_start_main.c
View File

@ -534,7 +534,7 @@ main(int argc, char **argv)
}
#ifdef HAVE_SYS_PTRACE_H
if (!really_know)
/* E17 should be in pause, we can detach */
/* E18 should be in pause, we can detach */
ptrace(PT_DETACH, child, NULL, back);
#endif
/* And call gdb if available */

2
src/bin/e_theme.c
View File

@ -327,7 +327,7 @@ e_theme_edje_icon_fallback_file_get(const char *group)
}
/*
* this is used to set the theme for a CATEGORY of E17. "base" is always set
* this is used to set the theme for a CATEGORY of E18. "base" is always set
* to the default theme - because if a selected theme wants "base/theme", but
* does not provide theme elements, it can fall back to the default theme.
*

4
src/bin/e_xinerama.c
View File

@ -119,7 +119,7 @@ _e_xinerama_update(void)
{
E_Screen *screen;
INF("E17 INIT: XINERAMA SCREEN: [%i][%i], %ix%i+%i+%i",
INF("E18 INIT: XINERAMA SCREEN: [%i][%i], %ix%i+%i+%i",
i, i, w, h, x, y);
/* add it to our list */
screen = E_NEW(E_Screen, 1);
@ -180,7 +180,7 @@ _e_xinerama_update(void)
EINA_LIST_FOREACH(chosen_screens, l, scr)
{
scr->escreen = n;
INF("E17 INIT: XINERAMA CHOSEN: [%i][%i], %ix%i+%i+%i",
INF("E18 INIT: XINERAMA CHOSEN: [%i][%i], %ix%i+%i+%i",
scr->screen, scr->escreen, scr->w, scr->h, scr->x, scr->y);
n++;
}