summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2013-12-26 22:27:23 -0500
committerMike Blumenkrantz <zmike@samsung.com>2013-12-26 22:27:23 -0500
commitd0ab5b335bd93c63764977c905249d88efbd8e7e (patch)
treec415c21b43cc03d960bf6cec03608486fb23f410
parentb1067a9ca797fb158e9294f8f58f36a402659639 (diff)
bugfix: startup splash now updates the version number more reliably
e_init_show() sets its own strings now so they get set on existing objects instead of failing silently
-rw-r--r--src/bin/e_init.c2
-rw-r--r--src/bin/e_main.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index fd3a8479b..e1755ffd1 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -93,6 +93,8 @@ e_init_show(void)
93 edje_object_signal_callback_add(_e_init_object, "e,state,done_ok", "e", 93 edje_object_signal_callback_add(_e_init_object, "e,state,done_ok", "e",
94 _e_init_cb_signal_done_ok, NULL); 94 _e_init_cb_signal_done_ok, NULL);
95 _e_init_timeout_timer = ecore_timer_add(240.0, _e_init_cb_timeout, NULL); 95 _e_init_timeout_timer = ecore_timer_add(240.0, _e_init_cb_timeout, NULL);
96 e_init_title_set(_("Enlightenment"));
97 e_init_version_set(VERSION);
96} 98}
97 99
98EAPI void 100EAPI void
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 9ecd6e4b0..ee25b08ec 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -646,11 +646,7 @@ main(int argc, char **argv)
646 _e_main_shutdown_push(e_init_shutdown); 646 _e_main_shutdown_push(e_init_shutdown);
647 } 647 }
648 if (!((!e_config->show_splash) || (after_restart))) 648 if (!((!e_config->show_splash) || (after_restart)))
649 { 649 e_init_show();
650 e_init_title_set(_("Enlightenment"));
651 e_init_version_set(VERSION);
652 e_init_show();
653 }
654 650
655 if (!really_know) 651 if (!really_know)
656 { 652 {