Enlightenment CVS committal
Author : shorne
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
.cvsignore Makefile.am e.h e_config.c e_config.h e_fm.c
e_imc_main.c e_includes.h e_intl.c e_intl.h e_main.c
Added Files:
e_config_data.c e_config_data.h e_intl_data.c e_intl_data.h
e_msgbus.c e_msgbus.h
Log Message:
Long waiting commit
* Break out intl data. Reduces the size of e_imc
* Add Dbus ipc replacement
* Elightenment Dbus API can be extended by modules (Example: msgbus_lang)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- .cvsignore 2 Mar 2007 17:00:20 -0000 1.7
+++ .cvsignore 25 Sep 2007 14:26:36 -0000 1.8
@@ -11,3 +11,4 @@
enlightenment_sys
enlightenment_thumb
enlightenment_fm
+enlightenment_init
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- Makefile.am 24 Sep 2007 01:16:47 -0000 1.202
+++ Makefile.am 25 Sep 2007 14:26:36 -0000 1.203
@@ -34,6 +34,7 @@
e_path.h \
e_init.h \
e_ipc.h \
+e_msgbus.h \
e_error.h \
e_container.h \
e_zone.h \
@@ -152,14 +153,17 @@
e_exec.h \
e_widget_font_preview.h \
e_fm_custom.h \
-e_fm_shared.h
-
+e_fm_shared.h \
+e_config_data.h \
+e_intl_data.h
+
enlightenment_src = \
e_user.c \
e_manager.c \
e_path.c \
e_init.c \
e_ipc.c \
+e_msgbus.c \
e_error.c \
e_container.c \
e_zone.c \
@@ -167,6 +171,7 @@
e_border.c \
e_pointer.c \
e_config.c \
+e_config_data.c \
e_menu.c \
e_object.c \
e_icon.c \
@@ -189,6 +194,7 @@
e_test.c \
e_font.c \
e_intl.c \
+e_intl_data.c \
e_theme.c \
e_dnd.c \
e_bindings.c \
@@ -284,7 +290,7 @@
e_main.c \
$(enlightenment_src)
-enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@
@cf_libs@ @VALGRIND_LIBS@
+enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@
@cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@
enlightenment_remote_SOURCES = \
e.h \
@@ -295,8 +301,10 @@
enlightenment_imc_SOURCES = \
e.h \
-e_imc_main.c \
-$(enlightenment_src)
+e_intl_data.c \
+e_config_data.c \
+e_imc_main.c
+# $(enlightenment_src)
enlightenment_imc_LDFLAGS = @e_libs@ @dlopen_libs@
@@ -318,7 +326,7 @@
e_sha1.c
enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @E_HAL_LIBS@
-enlightenment_fm_CFLAGS = $(INCLUDES) @E_DBUS_CFLAGS@ @E_HAL_CFLAGS@
+enlightenment_fm_CFLAGS = $(INCLUDES) @E_HAL_CFLAGS@
enlightenment_sys_SOURCES = \
e_sys_main.c
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e.h 15 Aug 2007 05:48:47 -0000 1.71
+++ e.h 25 Sep 2007 14:26:36 -0000 1.72
@@ -74,6 +74,9 @@
#include <Edje.h>
#include <Efreet.h>
#include <Efreet_Mime.h>
+#ifdef HAVE_EDBUS
+#include <E_DBus.h>
+#endif
#if HAVE___ATTRIBUTE__
#define __UNUSED__ __attribute__((unused))
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -3 -r1.271 -r1.272
--- e_config.c 16 Sep 2007 00:02:52 -0000 1.271
+++ e_config.c 25 Sep 2007 14:26:36 -0000 1.272
@@ -1651,30 +1651,6 @@
return 1;
}
-EAPI E_Config_DD *
-e_config_descriptor_new(const char *name, int size)
-{
- Eet_Data_Descriptor_Class eddc;
-
- eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
- eddc.func.mem_alloc = NULL;
- eddc.func.mem_free = NULL;
- eddc.func.str_alloc = (char *(*)(const char *)) evas_stringshare_add;
- eddc.func.str_free = (void (*)(const char *)) evas_stringshare_del;
- eddc.func.list_next = (void *(*)(void *)) evas_list_next;
- eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
- eddc.func.list_data = (void *(*)(void *)) evas_list_data;
- eddc.func.list_free = (void *(*)(void *)) evas_list_free;
- eddc.func.hash_foreach =
- (void (*) (void *, int (*) (void *, const char *, void *, void *), void
*))
- evas_hash_foreach;
- eddc.func.hash_add = (void *(*) (void *, const char *, void *))
evas_hash_add;
- eddc.func.hash_free = (void (*) (void *)) evas_hash_free;
- eddc.name = name;
- eddc.size = size;
- return (E_Config_DD *)eet_data_descriptor2_new(&eddc);
-}
-
EAPI int
e_config_save(void)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- e_config.h 4 Sep 2007 23:59:01 -0000 1.162
+++ e_config.h 25 Sep 2007 14:26:36 -0000 1.163
@@ -3,26 +3,6 @@
*/
#ifdef E_TYPEDEFS
-#define E_CONFIG_DD_NEW(str, typ) \
- e_config_descriptor_new(str, sizeof(typ))
-#define E_CONFIG_DD_FREE(eed) if (eed) { eet_data_descriptor_free((eed));
(eed) = NULL; }
-#define E_CONFIG_VAL(edd, type, member, dtype)
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, type, #member, member, dtype)
-#define E_CONFIG_SUB(edd, type, member, eddtype)
EET_DATA_DESCRIPTOR_ADD_SUB(edd, type, #member, member, eddtype)
-#define E_CONFIG_LIST(edd, type, member, eddtype)
EET_DATA_DESCRIPTOR_ADD_LIST(edd, type, #member, member, eddtype)
-#define E_CONFIG_HASH(edd, type, member, eddtype)
EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype)
-
-#define CHAR EET_T_CHAR
-#define SHORT EET_T_SHORT
-#define INT EET_T_INT
-#define LL EET_T_LONG_LONG
-#define FLOAT EET_T_FLOAT
-#define DOUBLE EET_T_DOUBLE
-#define UCHAR EET_T_UCHAR
-#define USHORT EET_T_USHORT
-#define UINT EET_T_UINT
-#define ULL EET_T_ULONG_LONG
-#define STR EET_T_STRING
-
#define E_CONFIG_LIMIT(v, min, max) {if (v > max) v = max; else if (v < min) v
= min;}
typedef struct _E_Config E_Config;
@@ -42,8 +22,6 @@
typedef struct _E_Event_Config_Icon_Theme E_Event_Config_Icon_Theme;
-typedef Eet_Data_Descriptor E_Config_DD;
-
#else
#ifndef E_CONFIG_H
#define E_CONFIG_H
@@ -435,8 +413,6 @@
EAPI int e_config_init(void);
EAPI int e_config_shutdown(void);
-
-EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size);
EAPI int e_config_save(void);
EAPI void e_config_save_flush(void);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -3 -r1.201 -r1.202
--- e_fm.c 19 Sep 2007 19:39:00 -0000 1.201
+++ e_fm.c 25 Sep 2007 14:26:36 -0000 1.202
@@ -4164,7 +4164,7 @@
if ((!e_storage_find(ic->info.link)) &&
(!e_volume_find(ic->info.link)))
{
- printf("REMOVE IT\n");
+ printf("REMOVE IT %s\n", ic->info.file);
_e_fm2_live_file_del(ic->sd->obj, ic->info.file);
efreet_desktop_free(desktop);
goto error;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_imc_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_imc_main.c 25 Mar 2007 22:44:59 -0000 1.5
+++ e_imc_main.c 25 Sep 2007 14:26:36 -0000 1.6
@@ -101,7 +101,7 @@
}
eet_init();
- e_intl_init();
+ e_intl_data_init();
if (write_ops != 0 && ecore_file_exists(file))
{
@@ -176,7 +176,7 @@
e_intl_input_method_config_free(read_imc);
E_FREE(write_imc);
eet_close(ef);
- e_intl_shutdown();
+ e_intl_data_shutdown();
eet_shutdown();
/* just return 0 to keep the compiler quiet */
return 0;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -3 -r1.171 -r1.172
--- e_includes.h 20 Aug 2007 18:50:20 -0000 1.171
+++ e_includes.h 25 Sep 2007 14:26:36 -0000 1.172
@@ -14,6 +14,7 @@
#include "e_border.h"
#include "e_pointer.h"
#include "e_config.h"
+#include "e_config_data.h"
#include "e_menu.h"
#include "e_icon.h"
#include "e_box.h"
@@ -37,6 +38,7 @@
#include "e_layout.h"
#include "e_font.h"
#include "e_intl.h"
+#include "e_intl_data.h"
#include "e_theme.h"
#include "e_dnd.h"
#include "e_bindings.h"
@@ -127,3 +129,4 @@
#include "e_exec.h"
#include "e_widget_font_preview.h"
#include "e_fm_custom.h"
+#include "e_msgbus.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- e_intl.c 25 Jul 2007 17:00:50 -0000 1.92
+++ e_intl.c 25 Sep 2007 14:26:36 -0000 1.93
@@ -21,8 +21,6 @@
static const char *_e_intl_imc_personal_path = NULL;
static const char *_e_intl_imc_system_path = NULL;
-static Eet_Data_Descriptor *_e_intl_input_method_config_edd = NULL;
-
#define E_EXE_STOP(EXE) if (EXE != NULL) { ecore_exe_terminate(EXE);
ecore_exe_free(EXE); EXE = NULL; }
#define E_EXE_IS_VALID(EXE) (!((EXE == NULL) || (EXE[0] == 0)))
@@ -60,14 +58,7 @@
{
char *s;
- _e_intl_input_method_config_edd = E_CONFIG_DD_NEW("input_method_config",
E_Input_Method_Config);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
version, INT);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
e_im_name, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
gtk_im_module, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
qt_im_module, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
xmodifiers, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
e_im_exec, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
e_im_setup_exec, STR);
+ e_intl_data_init();
if ((s = getenv("LC_MESSAGES"))) _e_intl_orig_lc_messages = strdup(s);
if ((s = getenv("LANGUAGE"))) _e_intl_orig_language = strdup(s);
@@ -99,7 +90,7 @@
if (_e_intl_imc_system_path)
evas_stringshare_del(_e_intl_imc_system_path);
- E_CONFIG_DD_FREE(_e_intl_input_method_config_edd);
+ e_intl_data_shutdown();
return 1;
}
@@ -437,48 +428,6 @@
}
return _e_intl_imc_system_path;
-}
-
-/* Get the input method configuration from the file */
-EAPI E_Input_Method_Config *
-e_intl_input_method_config_read(Eet_File *imc_file)
-{
- E_Input_Method_Config *imc;
-
- imc = NULL;
- if (imc_file)
- {
- imc = (E_Input_Method_Config *) eet_data_read(imc_file,
_e_intl_input_method_config_edd, "imc");
- }
- return imc;
-}
-
-/* Write the input method configuration to the file */
-EAPI int
-e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config
*imc)
-{
- int ok = 0;
-
- if (imc_file)
- {
- ok = eet_data_write(imc_file, _e_intl_input_method_config_edd, "imc",
imc, 0);
- }
- return ok;
-}
-
-EAPI void
-e_intl_input_method_config_free(E_Input_Method_Config *imc)
-{
- if (imc != NULL)
- {
- if (imc->e_im_name) evas_stringshare_del(imc->e_im_name);
- if (imc->gtk_im_module) evas_stringshare_del(imc->gtk_im_module);
- if (imc->qt_im_module) evas_stringshare_del(imc->qt_im_module);
- if (imc->xmodifiers) evas_stringshare_del(imc->xmodifiers);
- if (imc->e_im_exec) evas_stringshare_del(imc->e_im_exec);
- if (imc->e_im_setup_exec) evas_stringshare_del(imc->e_im_setup_exec);
- E_FREE(imc);
- }
}
static int
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_intl.h 27 Jan 2007 05:52:17 -0000 1.19
+++ e_intl.h 25 Sep 2007 14:26:36 -0000 1.20
@@ -11,42 +11,17 @@
*/
#define N_(str) (str)
-typedef struct _E_Input_Method_Config E_Input_Method_Config;
-typedef struct _E_Language_Pack E_Language_Pack;
typedef struct _E_Locale_Parts E_Locale_Parts;
#else
#ifndef E_INTL_H
#define E_INTL_H
-#define E_INTL_LANGUAGE_PACK_VERSION 1
-#define E_INTL_INPUT_METHOD_CONFIG_VERSION 2
-
#define E_INTL_LOC_CODESET 1 << 0
#define E_INTL_LOC_REGION 1 << 1
#define E_INTL_LOC_MODIFIER 1 << 2
#define E_INTL_LOC_LANG 1 << 3
-struct _E_Language_Pack
-{
- int language_pack_version;
- char *language_pack_name;
- char *language;
- char *input_method;
- Evas_List *font_fallbacks;
-};
-
-struct _E_Input_Method_Config
-{
- int version;
- const char *e_im_name;
- const char *gtk_im_module;
- const char *qt_im_module;
- const char *xmodifiers;
- const char *e_im_exec;
- const char *e_im_setup_exec;
-};
-
struct _E_Locale_Parts
{
int mask;
@@ -69,9 +44,6 @@
EAPI void e_intl_input_method_set(const char *method);
EAPI const char *e_intl_input_method_get(void);
EAPI Evas_List *e_intl_input_method_list(void);
-EAPI E_Input_Method_Config *e_intl_input_method_config_read (Eet_File
*imc_file);
-EAPI int e_intl_input_method_config_write (Eet_File *imc_file,
E_Input_Method_Config *imc);
-EAPI void e_intl_input_method_config_free (E_Input_Method_Config
*imc);
EAPI const char *e_intl_imc_personal_path_get(void);
EAPI const char *e_intl_imc_system_path_get(void);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -3 -r1.232 -r1.233
--- e_main.c 24 Sep 2007 10:53:44 -0000 1.232
+++ e_main.c 25 Sep 2007 14:26:36 -0000 1.233
@@ -492,7 +492,12 @@
/* setup e ipc service */
if (e_ipc_init())
_e_main_shutdown_push(e_ipc_shutdown);
-
+
+ TS("msgbus");
+ /* setup e msgbus (DBUS) service */
+ if (e_msgbus_init())
+ _e_main_shutdown_push(e_msgbus_shutdown);
+
/* setup edje to animate @ e_config->framerate frames per sec. */
edje_frametime_set(1.0 / e_config->framerate);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
