summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-06-18 15:39:53 +0100
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-06-18 15:44:57 +0100
commit5b3408bb854e8e91560279209827e4ab9d1bdd4e (patch)
tree8c8ca1037d859b02931c09a9010dfaccdc12eb31 /src
parentd2b7895f3d4fd42cc65394df9733b37f298d7239 (diff)
s/E17/E18/
Diffstat (limited to 'src')
-rw-r--r--src/bin/e_alert_main.c12
-rw-r--r--src/bin/e_config.c2
-rw-r--r--src/bin/e_configure_option.c4
-rw-r--r--src/bin/e_gadcon.c14
-rw-r--r--src/bin/e_main.c4
-rw-r--r--src/bin/e_module.c4
-rw-r--r--src/bin/e_start_main.c2
-rw-r--r--src/bin/e_theme.c2
-rw-r--r--src/bin/e_xinerama.c4
9 files changed, 24 insertions, 24 deletions
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index 1ce5a2b16..ac95c9259 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -88,7 +88,7 @@ main(int argc, char **argv)
88 88
89 fprintf(stderr, "exit_gdb: %i\n", exit_gdb); 89 fprintf(stderr, "exit_gdb: %i\n", exit_gdb);
90 90
91 tmp = getenv("E17_TAINTED"); 91 tmp = getenv("E18_TAINTED");
92 if (tmp && !strcmp(tmp, "NO")) 92 if (tmp && !strcmp(tmp, "NO"))
93 tainted = EINA_FALSE; 93 tainted = EINA_FALSE;
94 94
@@ -553,7 +553,7 @@ _e_alert_draw_text(void)
553 "on. We were not able to generate a backtrace, check \n" 553 "on. We were not able to generate a backtrace, check \n"
554 "if your 'sysactions.conf' has an 'gdb' action line.\n" 554 "if your 'sysactions.conf' has an 'gdb' action line.\n"
555 "\n" 555 "\n"
556 "Please compile latest svn E17 and EFL with\n" 556 "Please compile latest svn E18 and EFL with\n"
557 "-g and -ggdb3 in your CFLAGS.\n"); 557 "-g and -ggdb3 in your CFLAGS.\n");
558 } 558 }
559 else if (backtrace_str) 559 else if (backtrace_str)
@@ -561,9 +561,9 @@ _e_alert_draw_text(void)
561 snprintf(msg, sizeof(msg), 561 snprintf(msg, sizeof(msg),
562 "This is not meant to happen and is likely a sign of \n" 562 "This is not meant to happen and is likely a sign of \n"
563 "a bug in Enlightenment or the libraries it relies \n" 563 "a bug in Enlightenment or the libraries it relies \n"
564 "on. You will find an backtrace of E17 (%d) in :\n" 564 "on. You will find an backtrace of E18 (%d) in :\n"
565 "'%s'\n" 565 "'%s'\n"
566 "Before reporting issue, compile latest E17 and EFL\n" 566 "Before reporting issue, compile latest E18 and EFL\n"
567 "from svn with '-g -ggdb3' in your CFLAGS.\n" 567 "from svn with '-g -ggdb3' in your CFLAGS.\n"
568 "You can then report this crash on :\n" 568 "You can then report this crash on :\n"
569 "http://trac.enlightenment.org/e/.\n", 569 "http://trac.enlightenment.org/e/.\n",
@@ -579,7 +579,7 @@ _e_alert_draw_text(void)
579 "recover to try and get your desktop back the way \n" 579 "recover to try and get your desktop back the way \n"
580 "it was.\n" 580 "it was.\n"
581 "\n" 581 "\n"
582 "Please compile latest svn E17 and EFL with\n" 582 "Please compile latest svn E18 and EFL with\n"
583 "-g and -ggdb3 in your CFLAGS.\n", pid); 583 "-g and -ggdb3 in your CFLAGS.\n", pid);
584 } 584 }
585 } 585 }
@@ -591,7 +591,7 @@ _e_alert_draw_text(void)
591 "modules; before reporting this issue, please\n" 591 "modules; before reporting this issue, please\n"
592 "unload them and try to see if the bug is still\n" 592 "unload them and try to see if the bug is still\n"
593 "there. Also update to latest svn and be sure to\n" 593 "there. Also update to latest svn and be sure to\n"
594 "compile E17 and EFL with -g and -ggdb3 in your CFLAGS"); 594 "compile E18 and EFL with -g and -ggdb3 in your CFLAGS");
595 } 595 }
596 596
597 strcpy(warn, ""); 597 strcpy(warn, "");
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 3a5519ec0..eed7b7444 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1,6 +1,6 @@
1#include "e.h" 1#include "e.h"
2 2
3#if ((E17_PROFILE >= LOWRES_PDA) && (E17_PROFILE <= HIRES_PDA)) 3#if ((E18_PROFILE >= LOWRES_PDA) && (E18_PROFILE <= HIRES_PDA))
4#define DEF_MENUCLICK 1.25 4#define DEF_MENUCLICK 1.25
5#else 5#else
6#define DEF_MENUCLICK 0.25 6#define DEF_MENUCLICK 0.25
diff --git a/src/bin/e_configure_option.c b/src/bin/e_configure_option.c
index 3af2cf9b9..12ff63002 100644
--- a/src/bin/e_configure_option.c
+++ b/src/bin/e_configure_option.c
@@ -1945,7 +1945,7 @@ e_configure_option_init(void)
1945 1945
1946 OPT_ADD(BOOL, xsettings.enabled, _("Enable GTK application settings"), _("environment"), _("theme"), _("xsettings")); 1946 OPT_ADD(BOOL, xsettings.enabled, _("Enable GTK application settings"), _("environment"), _("theme"), _("xsettings"));
1947 co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update; 1947 co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update;
1948 OPT_ADD(BOOL, xsettings.match_e17_theme, _("Try setting GTK theme to match E17 theme"), _("environment"), _("theme"), _("xsettings")); 1948 OPT_ADD(BOOL, xsettings.match_e17_theme, _("Try setting GTK theme to match E18 theme"), _("environment"), _("theme"), _("xsettings"));
1949 co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update; 1949 co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update;
1950 OPT_ADD(STR, xsettings.net_theme_name, _("GTK theme name"), _("environment"), _("theme"), _("name"), _("xsettings")); 1950 OPT_ADD(STR, xsettings.net_theme_name, _("GTK theme name"), _("environment"), _("theme"), _("name"), _("xsettings"));
1951 co->funcs[0].none = e_xsettings_config_update; 1951 co->funcs[0].none = e_xsettings_config_update;
@@ -1961,7 +1961,7 @@ e_configure_option_init(void)
1961 co->thumb_cb = _e_configure_icon_theme_thumb_cb; 1961 co->thumb_cb = _e_configure_icon_theme_thumb_cb;
1962 co->event_type = E_EVENT_CONFIG_ICON_THEME; 1962 co->event_type = E_EVENT_CONFIG_ICON_THEME;
1963 OPT_ICON("preferences-desktop-theme"); 1963 OPT_ICON("preferences-desktop-theme");
1964 OPT_ADD(BOOL, icon_theme_overrides, _("Icon theme overrides E17 internal theme icons"), _("environment"), _("image"), _("theme"), _("xsettings")); // 1964 OPT_ADD(BOOL, icon_theme_overrides, _("Icon theme overrides E18 internal theme icons"), _("environment"), _("image"), _("theme"), _("xsettings")); //
1965 co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update; 1965 co->funcs[1].none = co->funcs[0].none = e_xsettings_config_update;
1966 1966
1967 OPT_ADD(BOOL, exe_always_single_instance, _("Always launch applications as single-instance"), _("exec")); 1967 OPT_ADD(BOOL, exe_always_single_instance, _("Always launch applications as single-instance"), _("exec"));
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 8f2a94b8f..ec32ab5d8 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -5540,7 +5540,7 @@ _e_gadcon_custom_populate_job(void *data __UNUSED__)
5540 Eina_List *l, *ll; 5540 Eina_List *l, *ll;
5541 E_Gadcon *gc; 5541 E_Gadcon *gc;
5542 5542
5543#ifndef E17_RELEASE_BUILD 5543#ifndef E18_RELEASE_BUILD
5544 static Eina_Bool first = EINA_TRUE; 5544 static Eina_Bool first = EINA_TRUE;
5545 if (first) 5545 if (first)
5546 e_main_ts("gadcon custom populate idler start"); 5546 e_main_ts("gadcon custom populate idler start");
@@ -5567,14 +5567,14 @@ _e_gadcon_custom_populate_job(void *data __UNUSED__)
5567 _e_gadcon_event_populate(gc); 5567 _e_gadcon_event_populate(gc);
5568 } 5568 }
5569 5569
5570#ifndef E17_RELEASE_BUILD 5570#ifndef E18_RELEASE_BUILD
5571 if (first) 5571 if (first)
5572 e_main_ts("gadcon custom populate idler end"); 5572 e_main_ts("gadcon custom populate idler end");
5573#endif 5573#endif
5574 if (!custom_populate_requests) 5574 if (!custom_populate_requests)
5575 { 5575 {
5576 custom_populate_job = NULL; 5576 custom_populate_job = NULL;
5577#ifndef E17_RELEASE_BUILD 5577#ifndef E18_RELEASE_BUILD
5578 first = EINA_FALSE; 5578 first = EINA_FALSE;
5579#endif 5579#endif
5580 } 5580 }
@@ -5587,7 +5587,7 @@ _e_gadcon_provider_populate_job(void *data __UNUSED__)
5587 Eina_List *l; 5587 Eina_List *l;
5588 E_Gadcon *gc; 5588 E_Gadcon *gc;
5589 5589
5590#ifndef E17_RELEASE_BUILD 5590#ifndef E18_RELEASE_BUILD
5591 static Eina_Bool first = EINA_TRUE; 5591 static Eina_Bool first = EINA_TRUE;
5592 if (first) 5592 if (first)
5593 e_main_ts("gadcon populate idler start"); 5593 e_main_ts("gadcon populate idler start");
@@ -5603,7 +5603,7 @@ _e_gadcon_provider_populate_job(void *data __UNUSED__)
5603 } 5603 }
5604 EINA_LIST_FREE(gc->populate_requests, cc) 5604 EINA_LIST_FREE(gc->populate_requests, cc)
5605 { 5605 {
5606#ifndef E17_RELEASE_BUILD 5606#ifndef E18_RELEASE_BUILD
5607 if (first) e_main_ts(cc->name); 5607 if (first) e_main_ts(cc->name);
5608#endif 5608#endif
5609 if (gc->populate_class.func) 5609 if (gc->populate_class.func)
@@ -5630,13 +5630,13 @@ _e_gadcon_provider_populate_job(void *data __UNUSED__)
5630 if (x && _modules_loaded) _e_gadcon_event_populate(gc); 5630 if (x && _modules_loaded) _e_gadcon_event_populate(gc);
5631 } 5631 }
5632//out: 5632//out:
5633#ifndef E17_RELEASE_BUILD 5633#ifndef E18_RELEASE_BUILD
5634 if (first) 5634 if (first)
5635 e_main_ts("gadcon populate idler end"); 5635 e_main_ts("gadcon populate idler end");
5636#endif 5636#endif
5637 5637
5638 populate_job = NULL; 5638 populate_job = NULL;
5639#ifndef E17_RELEASE_BUILD 5639#ifndef E18_RELEASE_BUILD
5640 first = EINA_FALSE; 5640 first = EINA_FALSE;
5641#endif 5641#endif
5642} 5642}
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index cf049eee0..5a10ffa30 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -1132,7 +1132,7 @@ _e_main_shutdown(int errcode)
1132{ 1132{
1133 int i = 0; 1133 int i = 0;
1134 1134
1135 printf("E17: Begin Shutdown Procedure!\n"); 1135 printf("E18: Begin Shutdown Procedure!\n");
1136 1136
1137 if (_idle_before) ecore_idle_enterer_del(_idle_before); 1137 if (_idle_before) ecore_idle_enterer_del(_idle_before);
1138 _idle_before = NULL; 1138 _idle_before = NULL;
@@ -1941,7 +1941,7 @@ _e_main_cb_idle_after(void *data __UNUSED__)
1941 1941
1942 edje_freeze(); 1942 edje_freeze();
1943 1943
1944#ifdef E17_RELEASE_BUILD 1944#ifdef E18_RELEASE_BUILD
1945 first_idle = 1; 1945 first_idle = 1;
1946 if (first_idle) 1946 if (first_idle)
1947 { 1947 {
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 9de1968e2..fc901cb13 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -759,7 +759,7 @@ _e_module_cb_idler(void *data __UNUSED__)
759 if (name) m = e_module_new(name); 759 if (name) m = e_module_new(name);
760 if (m) 760 if (m)
761 { 761 {
762#ifndef E17_RELEASE_BUILD 762#ifndef E18_RELEASE_BUILD
763 char buf[1024]; 763 char buf[1024];
764 snprintf(buf, sizeof(buf), "DELAYED MODULE LOAD: %s", name); 764 snprintf(buf, sizeof(buf), "DELAYED MODULE LOAD: %s", name);
765 e_main_ts(buf); 765 e_main_ts(buf);
@@ -953,7 +953,7 @@ _e_module_whitelist_check(void)
953 ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(), 953 ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(),
954 _x_tainted, &_e_tainted, 1); 954 _x_tainted, &_e_tainted, 1);
955 955
956 e_env_set("E17_TAINTED", state); 956 e_env_set("E18_TAINTED", state);
957 } 957 }
958 958
959 if (eina_list_count(badl) != known) 959 if (eina_list_count(badl) != known)
diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index 17a1b4c26..5ce220f7a 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -534,7 +534,7 @@ main(int argc, char **argv)
534 } 534 }
535#ifdef HAVE_SYS_PTRACE_H 535#ifdef HAVE_SYS_PTRACE_H
536 if (!really_know) 536 if (!really_know)
537 /* E17 should be in pause, we can detach */ 537 /* E18 should be in pause, we can detach */
538 ptrace(PT_DETACH, child, NULL, back); 538 ptrace(PT_DETACH, child, NULL, back);
539#endif 539#endif
540 /* And call gdb if available */ 540 /* And call gdb if available */
diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c
index 7d1251540..3ebcf7618 100644
--- a/src/bin/e_theme.c
+++ b/src/bin/e_theme.c
@@ -327,7 +327,7 @@ e_theme_edje_icon_fallback_file_get(const char *group)
327} 327}
328 328
329/* 329/*
330 * this is used to set the theme for a CATEGORY of E17. "base" is always set 330 * this is used to set the theme for a CATEGORY of E18. "base" is always set
331 * to the default theme - because if a selected theme wants "base/theme", but 331 * to the default theme - because if a selected theme wants "base/theme", but
332 * does not provide theme elements, it can fall back to the default theme. 332 * does not provide theme elements, it can fall back to the default theme.
333 * 333 *
diff --git a/src/bin/e_xinerama.c b/src/bin/e_xinerama.c
index 487465786..56351c7e2 100644
--- a/src/bin/e_xinerama.c
+++ b/src/bin/e_xinerama.c
@@ -119,7 +119,7 @@ _e_xinerama_update(void)
119 { 119 {
120 E_Screen *screen; 120 E_Screen *screen;
121 121
122 INF("E17 INIT: XINERAMA SCREEN: [%i][%i], %ix%i+%i+%i", 122 INF("E18 INIT: XINERAMA SCREEN: [%i][%i], %ix%i+%i+%i",
123 i, i, w, h, x, y); 123 i, i, w, h, x, y);
124 /* add it to our list */ 124 /* add it to our list */
125 screen = E_NEW(E_Screen, 1); 125 screen = E_NEW(E_Screen, 1);
@@ -180,7 +180,7 @@ _e_xinerama_update(void)
180 EINA_LIST_FOREACH(chosen_screens, l, scr) 180 EINA_LIST_FOREACH(chosen_screens, l, scr)
181 { 181 {
182 scr->escreen = n; 182 scr->escreen = n;
183 INF("E17 INIT: XINERAMA CHOSEN: [%i][%i], %ix%i+%i+%i", 183 INF("E18 INIT: XINERAMA CHOSEN: [%i][%i], %ix%i+%i+%i",
184 scr->screen, scr->escreen, scr->w, scr->h, scr->x, scr->y); 184 scr->screen, scr->escreen, scr->w, scr->h, scr->x, scr->y);
185 n++; 185 n++;
186 } 186 }