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

rename E19* defines/texts to just E so they don't need to keep being updated

This commit is contained in:
Mike Blumenkrantz 2014-09-09 12:30:50 -04:00
parent 452048354d
commit ec1cd25cfe
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version])
AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version])
AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison])
##AC_DEFINE_UNQUOTED(E19_RELEASE_BUILD, [1], [doin it])
##AC_DEFINE_UNQUOTED(E_RELEASE_BUILD, [1], [doin it])
version_info="lt_cur:lt_rev:lt_age"
release_info="v_rel"
AC_SUBST([version_info])
@ -624,7 +624,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" -DE19_PROFILE"=$profile
EDJE_DEF=$EDJE_DEF" -DE_PROFILE"=$profile
AC_SUBST([EDJE_DEF])
AC_ARG_WITH(edje-cc,

12
src/bin/e_alert_main.c
View File

@ -94,7 +94,7 @@ main(int argc, char **argv)
fprintf(stderr, "exit_gdb: %i\n", exit_gdb);
tmp = getenv("E19_TAINTED");
tmp = getenv("E_TAINTED");
if (tmp && !strcmp(tmp, "NO"))
tainted = EINA_FALSE;
@ -560,7 +560,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 Git E19 and EFL with\n"
"Please compile latest Git E and EFL with\n"
"-g and -ggdb3 in your CFLAGS.\n");
}
else if (backtrace_str)
@ -568,9 +568,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 E19 (%d) in :\n"
"on. You will find an backtrace of E (%d) in :\n"
"'%s'\n"
"Before reporting issue, compile latest E19 and EFL\n"
"Before reporting issue, compile latest E and EFL\n"
"from Git with '-g -ggdb3' in your CFLAGS.\n"
"You can then report this crash on :\n"
"https://phab.enlightenment.org/maniphest/.\n",
@ -586,7 +586,7 @@ _e_alert_draw_text(void)
"recover to try and get your desktop back the way \n"
"it was.\n"
"\n"
"Please compile latest Git E19 and EFL with\n"
"Please compile latest Git E and EFL with\n"
"-g and -ggdb3 in your CFLAGS.\n", pid);
}
}
@ -598,7 +598,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 Git and be sure to\n"
"compile E19 and EFL with -g and -ggdb3 in your CFLAGS");
"compile E and EFL with -g and -ggdb3 in your CFLAGS");
}
strcpy(warn, "");

2
src/bin/e_comp_object.c
View File

@ -218,7 +218,7 @@ _e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above, E_Comp_Object
cw->comp->layers[cw->layer].clients = eina_inlist_append(cw->comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
}
cw->comp->layers[cw->layer].clients_count++;
#ifndef E19_RELEASE_BUILD
#ifndef E_RELEASE_BUILD
if (layer_cw)
{
E_Client *below_ec = e_client_below_get(cw->ec);

2
src/bin/e_comp_x.c
View File

@ -4564,7 +4564,7 @@ _e_comp_x_xinerama_setup(int rw, int rh)
/* get each xinerama screen geometry */
if (ecore_x_xinerama_screen_geometry_get(i, &x, &y, &w, &h))
{
INF("E19 INIT: XINERAMA SCREEN: [%i][%i], %ix%i+%i+%i",
INF("E 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);

6
src/bin/e_config.c
View File

@ -1,6 +1,6 @@
#include "e.h"
#if ((E19_PROFILE >= LOWRES_PDA) && (E19_PROFILE <= HIRES_PDA))
#if ((E_PROFILE >= LOWRES_PDA) && (E_PROFILE <= HIRES_PDA))
#define DEF_MENUCLICK 1.25
#else
#define DEF_MENUCLICK 0.25
@ -1004,7 +1004,7 @@ e_config_load(void)
_e_config_edd_init(EINA_TRUE);
e_config = e_config_domain_load("e", _e_config_edd);
/* I made a c&p error here and fucked the world, so this ugliness
* will be my public mark of shame until E19 :/
* will be my public mark of shame until E :/
* -zmike, 2013
*/
if (e_config)
@ -1254,7 +1254,7 @@ e_config_load(void)
cf_es->popup = 0;
}
/* E19 layer values are higher */
/* E layer values are higher */
EINA_LIST_FOREACH(e_config->remembers, l, rem)
if (rem->apply & E_REMEMBER_APPLY_LAYER)
rem->prop.layer += 100;

14
src/bin/e_gadcon.c
View File

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

4
src/bin/e_main.c
View File

@ -1062,7 +1062,7 @@ _e_main_shutdown(int errcode)
char buf[PATH_MAX];
const char *dir;
printf("E19: Begin Shutdown Procedure!\n");
printf("E: Begin Shutdown Procedure!\n");
if (_idle_before) ecore_idle_enterer_del(_idle_before);
_idle_before = NULL;
@ -1733,7 +1733,7 @@ _e_main_cb_idle_after(void *data __UNUSED__)
edje_freeze();
#ifdef E19_RELEASE_BUILD
#ifdef E_RELEASE_BUILD
if (first_idle)
{
TS("SLEEP");

4
src/bin/e_module.c
View File

@ -795,7 +795,7 @@ _e_module_cb_idler(void *data __UNUSED__)
if (name) m = e_module_new(name);
if (m)
{
#ifndef E19_RELEASE_BUILD
#ifndef E_RELEASE_BUILD
char buf[1024];
snprintf(buf, sizeof(buf), "DELAYED MODULE LOAD: %s", name);
e_main_ts(buf);
@ -990,7 +990,7 @@ _e_module_whitelist_check(void)
_x_tainted, &_e_tainted, 1);
}
e_env_set("E19_TAINTED", state);
e_env_set("E_TAINTED", state);
}
#endif

2
src/bin/e_start_main.c
View File

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

2
src/bin/e_xinerama.c
View File

@ -133,7 +133,7 @@ _e_xinerama_update(void)
EINA_LIST_FOREACH(chosen_screens, l, scr)
{
scr->escreen = n;
INF("E19 INIT: XINERAMA CHOSEN: [%i][%i], %ix%i+%i+%i",
INF("E INIT: XINERAMA CHOSEN: [%i][%i], %ix%i+%i+%i",
scr->screen, scr->escreen, scr->w, scr->h, scr->x, scr->y);
n++;
}

2
src/modules/gadman/e_mod_gadman.c
View File

@ -639,7 +639,7 @@ gadman_update_bg(void)
case BG_CUSTOM:
if (eina_str_has_extension(Man->conf->custom_bg, ".edj"))
{
//THIS IS FOR E19 backgrounds
//THIS IS FOR E backgrounds
obj = edje_object_add(Man->comp->evas);
edje_object_file_set(obj, Man->conf->custom_bg,
"e/desktop/background");