Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/lib
Modified Files:
E.h e_main.c
Log Message:
unfortunately i had to change the libe api to e_lib_ instead of e_ prefix to
avoid namespace comnflicts with the rest of e17. i simplified the including
as i am sure sooner or later we will need the defines, enums etc. from other
e include files so this will minimise breakage.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/E.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- E.h 3 Jun 2005 18:26:35 -0000 1.9
+++ E.h 5 Jun 2005 01:43:42 -0000 1.10
@@ -65,31 +65,31 @@
#endif
/* library startup and shutdown */
- EAPI int e_init (const char *display);
- EAPI int e_shutdown (void);
+ EAPI int e_lib_init (const char *display);
+ EAPI int e_lib_shutdown (void);
/* E startup and shutdown */
- EAPI void e_restart (void);
- EAPI void e_quit (void);
+ EAPI void e_lib_restart (void);
+ EAPI void e_lib_quit (void);
/* E module manipulation */
- EAPI void e_module_enabled_set (const char *module, int
enable);
- EAPI void e_module_loaded_set (const char *module, int
load);
- EAPI void e_module_list (void);
+ EAPI void e_lib_module_enabled_set (const char *module, int
enable);
+ EAPI void e_lib_module_loaded_set (const char *module, int
load);
+ EAPI void e_lib_module_list (void);
/* E desktop manipulation */
- EAPI void e_background_set (const char *bgfile);
- EAPI void e_background_get (void);
+ EAPI void e_lib_background_set (const char *bgfile);
+ EAPI void e_lib_background_get (void);
/* E path information */
- EAPI void e_data_dirs_list (void);
- EAPI void e_image_dirs_list (void);
- EAPI void e_font_dirs_list (void);
- EAPI void e_theme_dirs_list (void);
- EAPI void e_init_dirs_list (void);
- EAPI void e_icon_dirs_list (void);
- EAPI void e_module_dirs_list (void);
- EAPI void e_background_dirs_list (void);
+ EAPI void e_lib_data_dirs_list (void);
+ EAPI void e_lib_image_dirs_list (void);
+ EAPI void e_lib_font_dirs_list (void);
+ EAPI void e_lib_theme_dirs_list (void);
+ EAPI void e_lib_init_dirs_list (void);
+ EAPI void e_lib_icon_dirs_list (void);
+ EAPI void e_lib_module_dirs_list (void);
+ EAPI void e_lib_background_dirs_list (void);
#ifdef __cplusplus
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/e_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_main.c 3 Jun 2005 18:26:35 -0000 1.19
+++ e_main.c 5 Jun 2005 01:43:42 -0000 1.20
@@ -21,16 +21,7 @@
#include <Ecore.h>
#include <Ecore_Ipc.h>
#include "E.h"
-#include "e_private.h"
-
-#define E_TYPEDEFS 1
-#include "e_config.h"
-#include "e_ipc_codec.h"
-#undef E_TYPEDEFS
-#include "e_config.h"
-#include "e_ipc_codec.h"
-#define E_H
-#include "e_ipc_codec.c"
+#include "e.h"
typedef struct _Opt Opt;
@@ -80,7 +71,7 @@
* If parameter is null try to use DISPLAY env var.
*/
int
-e_init(const char* display)
+e_lib_init(const char* display)
{
char *disp, *pos;
int free_disp;
@@ -95,7 +86,7 @@
disp = getenv("DISPLAY");
if (!disp)
- fprintf(stderr, "ERROR: No display parameter passed to e_init, and no
DISPLAY variable\n");
+ fprintf(stderr, "ERROR: No display parameter passed to e_lib_init, and no
DISPLAY variable\n");
pos = strrchr(disp, ':');
if (!pos)
@@ -169,7 +160,7 @@
* close our connection to E
*/
int
-e_shutdown(void)
+e_lib_shutdown(void)
{
e_ipc_codec_shutdown();
_e_ipc_shutdown();
@@ -181,19 +172,19 @@
/* actual IPC calls */
void
-e_restart(void)
+e_lib_restart(void)
{
_e_ipc_call(E_IPC_OP_RESTART, NULL);
}
void
-e_quit(void)
+e_lib_quit(void)
{
_e_ipc_call(E_IPC_OP_SHUTDOWN, NULL);
}
void
-e_module_enabled_set(const char *module, int enable)
+e_lib_module_enabled_set(const char *module, int enable)
{
if (!module)
return;
@@ -205,7 +196,7 @@
}
void
-e_module_load_set(const char *module, int load)
+e_lib_module_load_set(const char *module, int load)
{
if (!module)
return;
@@ -217,13 +208,13 @@
}
void
-e_module_list(void)
+e_lib_module_list(void)
{
_e_ipc_call(E_IPC_OP_MODULE_LIST, NULL);
}
void
-e_background_set(const char *bgfile)
+e_lib_background_set(const char *bgfile)
{
if (!bgfile)
return;
@@ -232,62 +223,62 @@
}
void
-e_background_get(void)
+e_lib_background_get(void)
{
_e_ipc_call(E_IPC_OP_BG_GET, NULL);
}
void
-e_data_dirs_list(void)
+e_lib_data_dirs_list(void)
{
char *type = "data";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
-e_image_dirs_list(void)
+e_lib_image_dirs_list(void)
{
char *type = "images";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
-e_font_dirs_list(void)
+e_lib_font_dirs_list(void)
{
char *type = "fonts";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
-e_theme_dirs_list(void)
+e_lib_theme_dirs_list(void)
{
char *type = "themes";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
-e_init_dirs_list(void)
+e_lib_init_dirs_list(void)
{
char *type = "inits";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
-e_icon_dirs_list(void)
+e_lib_icon_dirs_list(void)
{
char *type = "icons";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
-e_module_dirs_list(void)
+e_lib_module_dirs_list(void)
{
char *type = "modules";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
-e_background_dirs_list(void)
+e_lib_background_dirs_list(void)
{
char *type = "backgrounds";
_e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
