From: <enl...@li...> - 2004-03-27 21:44:27
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/examine Dir : e17/apps/examine/src Modified Files: examine_client.c examine_client.h exsh.c ipc.h Log Message: Modified behaviour to call global_list where appropriate now exsh and examine can properly handle the _system connection =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine_client.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- examine_client.c 25 Mar 2004 20:01:31 -0000 1.4 +++ examine_client.c 27 Mar 2004 21:33:17 -0000 1.5 @@ -13,6 +13,8 @@ #include "examine_client.h" +char *client_name; + typedef enum Examine_Callback_Type { EX_DATA_SET = 0, EX_DATA_GET = 1, @@ -168,7 +170,11 @@ return; } - c = find_call("prop-list"); + if (!strcmp(client_name, ECORE_CONFIG_GLOBAL_ID)) + c = find_call("global-prop-list"); + else + c = find_call("prop-list"); + examine_client_send(c, NULL, NULL); expected_type = EX_DATA_LIST; @@ -426,6 +432,7 @@ int examine_client_init(char *pipe_name, connstate * cs) { + client_name = strdup(pipe_name); return ecore_config_ipc_init(&examine_client_server, pipe_name, cs); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine_client.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- examine_client.h 25 Mar 2004 20:01:31 -0000 1.4 +++ examine_client.h 27 Mar 2004 21:33:17 -0000 1.5 @@ -61,6 +61,7 @@ {IPC_NONE, "prop", P_HELPONLY}, {IPC_PROP_LIST, "prop-list", P_SERIAL}, + {IPC_GLOBAL_PROP_LIST, "global-prop-list", P_SERIAL}, {IPC_PROP_DESC, "prop-describe", P_SERIAL | P_KEY}, {IPC_PROP_GET, "prop-get", P_SERIAL | P_KEY}, {IPC_PROP_SET, "prop-set", P_SERIAL | P_KEY | P_VALUE}, =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/examine/src/exsh.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- exsh.c 25 Mar 2004 20:01:31 -0000 1.5 +++ exsh.c 27 Mar 2004 21:33:17 -0000 1.6 @@ -99,6 +99,8 @@ {IPC_NONE, "prop", P_HELPONLY, "List of property-related commands"}, {IPC_PROP_LIST, "prop-list", P_SERIAL, "prop.list <bundle-id>\nList all properties that are currently registered for bundle <bundle-id>."}, + {IPC_GLOBAL_PROP_LIST, "global-prop-list", P_NONE, + "global.prop.list\nList all global properties that are currently registered."}, {IPC_PROP_DESC, "prop-describe", P_SERIAL | P_KEY, "prop.desc <bundle-id> <prop>\nDescribe property <prop> set on bundle <bundle-id>."}, {IPC_PROP_GET, "prop-get", P_SERIAL | P_KEY, @@ -125,7 +127,7 @@ int debug = 99; - +char *pipe_name; /*****************************************************************************/ @@ -536,6 +538,11 @@ if (!cp) ret = ECORE_CONFIG_ERR_NOTFOUND; else { + + if (cp->id == IPC_PROP_LIST) + if (!strcmp(pipe_name, ECORE_CONFIG_GLOBAL_ID)) + cp=find_call("global-prop-list"); + if (h) puts(cp->help); else if (cp->signature & P_HELPONLY) { @@ -585,7 +592,6 @@ int ret, cc; connstate cs; char *p, *f, *q; - char *pipe_name; #ifndef HAVE_LIBREADLINE char buf[MI]; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/examine/src/ipc.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ipc.h 25 Mar 2004 20:01:31 -0000 1.4 +++ ipc.h 27 Mar 2004 21:33:17 -0000 1.5 @@ -4,6 +4,7 @@ typedef enum { IPC_NONE, IPC_PROP_LIST, + IPC_GLOBAL_PROP_LIST, IPC_PROP_DESC, IPC_PROP_GET, IPC_PROP_SET, |