Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/lib
Modified Files:
E.h e_main.c
Log Message:
Port the dirs_list IPC to libe - now up to the functionality it was before IPC
changes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/E.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- E.h 31 May 2005 03:01:53 -0000 1.7
+++ E.h 3 Jun 2005 17:43:48 -0000 1.8
@@ -22,10 +22,8 @@
typedef struct _E_Response_Module_List E_Response_Module_List;
typedef struct _E_Response_Module_Data E_Response_Module_Data;
-typedef struct _E_Response_Module_Dirs_List E_Response_Module_Dirs_List;
+typedef struct _E_Response_Dirs_List E_Response_Dirs_List;
typedef struct _E_Response_Background_Get E_Response_Background_Get;
-typedef struct _E_Response_Background_Dirs_List
E_Response_Background_Dirs_List;
-typedef struct _E_Response_Theme_Dirs_List E_Response_Theme_Dirs_List;
struct _E_Response_Module_List
{
@@ -39,7 +37,7 @@
char enabled;
};
-struct _E_Response_Module_Dirs_List
+struct _E_Response_Dirs_List
{
char **dirs;
int count;
@@ -50,18 +48,6 @@
char *file;
};
-struct _E_Response_Background_Dirs_List
-{
- char **dirs;
- int count;
-};
-
-struct _E_Response_Theme_Dirs_List
-{
- char **dirs;
- int count;
-};
-
extern EAPI int E_RESPONSE_MODULE_LIST;
extern EAPI int E_RESPONSE_BACKGROUND_GET;
extern EAPI int E_RESPONSE_MODULE_DIRS_LIST;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/e_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_main.c 3 Jun 2005 03:18:05 -0000 1.17
+++ e_main.c 3 Jun 2005 17:43:48 -0000 1.18
@@ -63,10 +63,10 @@
static Ecore_Ipc_Server *_e_ipc_server = NULL;
int E_RESPONSE_MODULE_LIST = 0;
-//int E_RESPONSE_MODULE_DIRS_LIST = 0;
+int E_RESPONSE_MODULE_DIRS_LIST = 0;
int E_RESPONSE_BACKGROUND_GET = 0;
-//int E_RESPONSE_BACKGROUND_DIRS_LIST = 0;
-//int E_RESPONSE_THEME_DIRS_LIST = 0;
+int E_RESPONSE_BACKGROUND_DIRS_LIST = 0;
+int E_RESPONSE_THEME_DIRS_LIST = 0;
/*
* initialise connection to the current E running on "display".
@@ -140,10 +140,10 @@
if (!E_RESPONSE_MODULE_LIST)
{
E_RESPONSE_MODULE_LIST = ecore_event_type_new();
-// E_RESPONSE_MODULE_DIRS_LIST = ecore_event_type_new();
+ E_RESPONSE_MODULE_DIRS_LIST = ecore_event_type_new();
E_RESPONSE_BACKGROUND_GET = ecore_event_type_new();
-// E_RESPONSE_BACKGROUND_DIRS_LIST = ecore_event_type_new();
-// E_RESPONSE_THEME_DIRS_LIST = ecore_event_type_new();
+ E_RESPONSE_BACKGROUND_DIRS_LIST = ecore_event_type_new();
+ E_RESPONSE_THEME_DIRS_LIST = ecore_event_type_new();
}
if (free_disp)
@@ -211,9 +211,8 @@
void
e_module_dirs_list(void)
{
-// ecore_ipc_server_send(_e_ipc_server, E_IPC_DOMAIN_REQUEST,
-// E_IPC_OP_MODULE_DIRS_LIST, 0/*ref*/, 0/*ref_to*/,
-// 0/*response*/, NULL, 0);
+ char *type = "modules";
+ _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
@@ -234,21 +233,17 @@
void
e_background_dirs_list(void)
{
-// ecore_ipc_server_send(_e_ipc_server, E_IPC_DOMAIN_REQUEST,
-// E_IPC_OP_BG_DIRS_LIST, 0/*ref*/,
-// 0/*ref_to*/, 0/*response*/, NULL, 0);
+ char *type = "backgrounds";
+ _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
void
e_theme_dirs_list(void)
{
-// ecore_ipc_server_send(_e_ipc_server, E_IPC_DOMAIN_REQUEST,
-// E_IPC_OP_THEME_DIRS_LIST, 0/*ref*/,
-// 0/*ref_to*/, 0/*response*/, NULL, 0);
+ char *type = "themes";
+ _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
}
-//static int reply_count = 0;
-
static int
_e_ipc_init(const char *display)
{
@@ -330,117 +325,6 @@
default:
break;
}
-
-
- /*
- Ecore_Ipc_Event_Server_Data *e;
-
- e = event;
-
- type = E_IPC_OP_MODULE_LIST;
- switch (e->minor)
- {
-
- case E_IPC_OP_MODULE_DIRS_LIST_REPLY:
- if (e->data)
- {
- E_Response_Module_Dirs_List *res;
- int count = 0;
- char *p;
-
- res = calloc(1, sizeof(E_Response_Module_Dirs_List));
-
- p = e->data;
- while (p < (char *)(e->data + e->size))
- {
- p += strlen(p) + 1;
- count ++;
- }
-
- res->dirs = malloc(sizeof(char *) * count);
- res->count = count;
-
- count = 0;
- p = e->data;
- while (p < (char *)(e->data + e->size))
- {
- res->dirs[count] = p;
- p += strlen(res->dirs[count]) + 1;
- count++;
- }
- ecore_event_add(E_RESPONSE_MODULE_DIRS_LIST, res,
- _e_cb_module_dir_list_free, NULL);
- }
- break;
-
- case E_IPC_OP_BG_DIRS_LIST_REPLY:
- if (e->data)
- {
- E_Response_Background_Dirs_List *res;
- char *p;
- int count = 0;
-
- res = calloc(1, sizeof(E_Response_Background_Dirs_List));
-
- p = e->data;
- while (p < (char *)(e->data + e->size))
- {
- p += strlen(p) + 1;
- count ++;
- }
-
- res->dirs = malloc(sizeof(char *) * count);
- res->count = count;
-
- count = 0;
- p = e->data;
- while (p < (char *)(e->data + e->size))
- {
- res->dirs[count] = p;
- p += strlen(res->dirs[count]) + 1;
- count++;
- }
- ecore_event_add(E_RESPONSE_BACKGROUND_DIRS_LIST, res,
- _e_cb_bg_dir_list_free, NULL);
- }
- break;
-
- case E_IPC_OP_THEME_DIRS_LIST_REPLY:
- if (e->data)
- {
- E_Response_Theme_Dirs_List *res;
- char *p;
- int count = 0;
-
- res = calloc(1, sizeof(E_Response_Theme_Dirs_List));
-
- p = e->data;
- while (p < (char *)(e->data + e->size))
- {
- p += strlen(p) + 1;
- count ++;
- }
-
- res->dirs = malloc(sizeof(char *) * count);
- res->count = count;
-
- count = 0;
- p = e->data;
- while (p < (char *)(e->data + e->size))
- {
- res->dirs[count] = p;
- p += strlen(res->dirs[count]) + 1;
- count++;
- }
- ecore_event_add(E_RESPONSE_THEME_DIRS_LIST, res,
- _e_cb_theme_dir_list_free, NULL);
- }
- break;
-
- default:
- break;
- }
- return 1;*/
}
static void _e_cb_module_list_free(void *data __UNUSED__, void *ev)
@@ -458,29 +342,9 @@
}
static void
-_e_cb_module_dir_list_free(void *data __UNUSED__, void *ev)
-{
- E_Response_Module_Dirs_List *e;
-
- e = ev;
- free(e->dirs);
- free(e);
-}
-
-static void
-_e_cb_bg_dir_list_free(void *data __UNUSED__, void *ev)
-{
- E_Response_Background_Dirs_List *e;
-
- e = ev;
- free(e->dirs);
- free(e);
-}
-
-static void
-_e_cb_theme_dir_list_free(void *data __UNUSED__, void *ev)
+_e_cb_dir_list_free(void *data __UNUSED__, void *ev)
{
- E_Response_Theme_Dirs_List *e;
+ E_Response_Dirs_List *e;
e = ev;
free(e->dirs);
-------------------------------------------------------
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
