Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_init.c e_init.h e_main.c e_startup.c
Log Message:
1 more TODOãitem gone :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_init.c 27 May 2005 10:04:53 -0000 1.22
+++ e_init.c 22 Jun 2005 14:09:16 -0000 1.23
@@ -5,6 +5,7 @@
static void _e_init_icons_del(void);
static void _e_init_cb_signal_disable(void *data, Evas_Object *obj, const char
*emission, const char *source);
+static void _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char
*emission, const char *source);
/* local subsystem globals */
static Ecore_X_Window _e_init_win = 0;
@@ -110,6 +111,8 @@
_("Disable this splash screen in the future?"));
edje_object_signal_callback_add(_e_init_object, "disable_state", "*",
_e_init_cb_signal_disable, NULL);
+ edje_object_signal_callback_add(_e_init_object, "done_ok", "*",
+ _e_init_cb_signal_done_ok, NULL);
free(roots);
return 1;
}
@@ -175,7 +178,12 @@
return _e_init_win;
}
-/* code for displaying startup icons */
+void
+e_init_done(void)
+{
+ if (!_e_init_object) return;
+ edje_object_signal_emit(_e_init_object, "done", "");
+}
void
e_init_icons_app_add(E_App *app)
@@ -247,3 +255,9 @@
else e_config->show_splash = 1;
e_config_save_queue();
}
+
+static void
+_e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission,
const char *source)
+{
+ e_init_hide();
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_init.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_init.h 7 Feb 2005 15:09:37 -0000 1.5
+++ e_init.h 22 Jun 2005 14:09:17 -0000 1.6
@@ -14,7 +14,8 @@
EAPI void e_init_version_set(const char *str);
EAPI void e_init_status_set(const char *str);
EAPI Ecore_X_Window e_init_window_get(void);
-
+EAPI void e_init_done(void);
+
EAPI void e_init_icons_app_add(E_App *app);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- e_main.c 20 Jun 2005 08:56:54 -0000 1.103
+++ e_main.c 22 Jun 2005 14:09:17 -0000 1.104
@@ -481,9 +481,6 @@
if (!((!e_config->show_splash) || (after_restart)))
{
- ecore_timer_add( 3.0, _e_main_cb_startup_fake_status, _("Artificially
slowing startup so you can see it all."));
- ecore_timer_add( 7.5, _e_main_cb_startup_fake_status, _("This is
development code, so be warned."));
- ecore_timer_add(12.0, _e_main_cb_startup_fake_status, _("Most features
do not work yet, and those that do are buggy."));
ecore_timer_add(16.0, _e_main_cb_startup_fake_end, NULL);
}
@@ -977,13 +974,6 @@
}
static int
-_e_main_cb_startup_fake_status(void *data)
-{
- e_init_status_set((const char *)data);
- return 0;
-}
-
-static int
_e_main_cb_startup_fake_end(void *data __UNUSED__)
{
e_init_hide();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_startup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_startup.c 7 Feb 2005 15:09:37 -0000 1.3
+++ e_startup.c 22 Jun 2005 14:09:17 -0000 1.4
@@ -47,7 +47,11 @@
E_App *a;
char buf[4096];
- if (!startup_apps) return;
+ if (!startup_apps)
+ {
+ e_init_done();
+ return;
+ }
a = evas_list_nth(startup_apps->subapps, start_app_pos);
start_app_pos++;
if (!a)
@@ -57,7 +61,7 @@
start_app_pos = -1;
waiting_app = NULL;
e_app_change_callback_del(_e_startup_app_exit_cb, NULL);
-// e_init_hide();
+ e_init_done();
return;
}
e_app_exec(a);
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
