Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_main.c etk_theme.c etk_utils.h
Log Message:
* [Engine] Update the Ecore_FB engine to the new engine API
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_engine.c 3 Sep 2006 18:36:11 -0000 1.11
+++ etk_engine.c 5 Sep 2006 00:14:57 -0000 1.12
@@ -171,7 +171,10 @@
handle = dlopen(filename, RTLD_LAZY | RTLD_GLOBAL);
if (!handle)
{
- ETK_WARNING("Etk can not dlopen the requested engine!");
+ char *error;
+
+ error = dlerror();
+ ETK_WARNING("Etk can not dlopen the requested engine: %s", error ? error
: "Unknown error");
return NULL;
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- etk_main.c 3 Sep 2006 18:36:11 -0000 1.33
+++ etk_main.c 5 Sep 2006 00:14:57 -0000 1.34
@@ -92,11 +92,6 @@
/* TODO: reorder ? */
/* Initialize the subsystems of Etk */
- if (!etk_engine_init())
- {
- ETK_WARNING("Etk_Engine initialization failed!");
- return 0;
- }
if (!etk_config_init())
{
ETK_WARNING("Etk_Config initialization failed!");
@@ -104,6 +99,11 @@
}
etk_config_load();
etk_theme_init();
+ if (!etk_engine_init())
+ {
+ ETK_WARNING("Etk_Engine initialization failed!");
+ return 0;
+ }
if (!etk_engine_load(engine_name ? engine_name :
"ecore_evas_software_x11"))
{
ETK_WARNING("Etk can not load the requested engine!");
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_theme.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_theme.c 1 Sep 2006 02:42:57 -0000 1.8
+++ etk_theme.c 5 Sep 2006 00:14:57 -0000 1.9
@@ -22,13 +22,11 @@
/** @brief Initializes the theming system of Etk. Do not call it manually,
etk_init() calls it! */
void etk_theme_init()
{
- _etk_theme_default_widget_theme = _etk_theme_find("themes",
etk_config_widget_theme_get());
- if (!_etk_theme_default_widget_theme)
- _etk_theme_default_widget_theme = strdup("default");
+ _etk_theme_default_widget_theme = _etk_theme_find("themes", "default");
_etk_theme_default_icon_theme = _etk_theme_find("icons", "default");
/* TODO: etk_config: add support of non default themes */
- etk_theme_widget_theme_set(_etk_theme_default_widget_theme);
+ etk_theme_widget_theme_set(etk_config_widget_theme_get());
etk_theme_icon_theme_set("default");
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_utils.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_utils.h 3 Sep 2006 18:36:11 -0000 1.12
+++ etk_utils.h 5 Sep 2006 00:14:57 -0000 1.13
@@ -28,7 +28,7 @@
/** Displays a warning in the output console */
#define ETK_WARNING(format, ...) \
- fprintf(stderr, "[Etk-Warning] [%s:%d - %s]: " format "\n", __FILE__,
__LINE__, __FUNCTION__, ##__VA_ARGS__)
+ fprintf(stderr, "[Etk-Warning] (%s:%d - %s()):\n" format "\n\n", __FILE__,
__LINE__, __FUNCTION__, ##__VA_ARGS__)
void etk_accumulator_bool_or(void *return_value, const void *value_to_accum,
void *data);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
