Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : rain
Dir : e_modules/rain
Modified Files:
e-module-rain.edj e_mod_config.c e_mod_config.h e_mod_main.c
e_mod_main.h
Log Message:
Update rain module for recent api breakage.
===================================================================
RCS file: /cvs/e/e_modules/rain/e-module-rain.edj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsTWTG3B and /tmp/cvsk7Il3t differ
===================================================================
RCS file: /cvs/e/e_modules/rain/e_mod_config.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_config.c 17 Sep 2006 15:54:48 -0000 1.23
+++ e_mod_config.c 31 Oct 2007 14:24:14 -0000 1.24
@@ -20,13 +20,15 @@
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
static void _fill_data(Rain *rn, E_Config_Dialog_Data *cfdata);
-void
-_config_rain_module(E_Container *con, Rain *r)
+EAPI E_Config_Dialog *e_int_config_rain_module(E_Container *con, const char
*params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
+ Rain *r;
char buf[4096];
-
+
+ r = rain_module->data;
+
v = E_NEW(E_Config_Dialog_View, 1);
if (v)
@@ -36,7 +38,7 @@
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
- snprintf(buf, sizeof(buf), "%s/module.edj",
e_module_dir_get(r->module));
+ snprintf(buf, sizeof(buf), "%s/e-module-rain.edj",
e_module_dir_get(r->module));
cfd = e_config_dialog_new(con, D_("Rain Module"), "Rain",
"_e_modules_rain_config_dialog", buf, 0, v, r);
r->config_dialog = cfd;
}
===================================================================
RCS file: /cvs/e/e_modules/rain/e_mod_config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_config.h 30 Jan 2006 05:12:51 -0000 1.7
+++ e_mod_config.h 31 Oct 2007 14:24:14 -0000 1.8
@@ -3,6 +3,6 @@
# ifndef E_MOD_CONFIG_H
# define E_MOD_CONFIG_H
# include "e_mod_main.h"
-void _config_rain_module(E_Container *con, Rain *r);
+EAPI E_Config_Dialog *e_int_config_rain_module(E_Container *con, const char
*params __UNUSED__);
# endif
#endif
===================================================================
RCS file: /cvs/e/e_modules/rain/e_mod_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_mod_main.c 15 Mar 2007 13:45:48 -0000 1.25
+++ e_mod_main.c 31 Oct 2007 14:24:14 -0000 1.26
@@ -10,6 +10,8 @@
static void _rain_clouds_load(Rain *rain);
static void _rain_drops_load(char type, Rain *rain);
+EAPI E_Module *rain_module = NULL;
+
/* public module routines. all modules must have these */
EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
@@ -20,12 +22,20 @@
e_modapi_init(E_Module *m)
{
Rain *rain;
+ char buf[4096];
/* Set up module's message catalogue */
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
+ snprintf(buf, sizeof(buf), "%s/e-module-rain.edj", e_module_dir_get(m));
+ e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL,
+ "enlightenment/appearance");
+ e_configure_registry_item_add("appearance/rain", 150, _("Rain"), NULL,
+ buf, e_int_config_rain_module);
+
rain = _rain_init(m);
+rain_module = m;
return rain;
}
@@ -34,6 +44,9 @@
{
Rain *rain;
+ e_configure_registry_item_del("appearance/rain");
+ e_configure_registry_category_del("appearance");
+
rain = m->data;
if (rain)
{
@@ -56,42 +69,6 @@
if (!rain)
return 1;
e_config_domain_save("module.rain", rain->conf_edd, rain->conf);
- return 1;
-}
-
-EAPI int
-e_modapi_about(E_Module *m)
-{
- e_module_dialog_show(m, D_("Enlightenment Rain Module"),
- D_
- ("This is a simple module to display some rain on the
desktop.<br>It can display clouds too, if you like clouds."));
- return 1;
-}
-
-EAPI int
-e_modapi_config(E_Module *m)
-{
- Rain *r;
- E_Container *con;
- Evas_List *l;
-
- r = m->data;
- if (!r)
- return 0;
- if (!r->cons)
- return 0;
- con = e_container_current_get(e_manager_current_get());
- for (l = r->cons; l; l = l->next)
- {
- E_Container *c;
-
- c = l->data;
- if (c == con)
- {
- _config_rain_module(con, r);
- break;
- }
- }
return 1;
}
===================================================================
RCS file: /cvs/e/e_modules/rain/e_mod_main.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.h 3 Jun 2006 13:29:40 -0000 1.12
+++ e_mod_main.h 31 Oct 2007 14:24:14 -0000 1.13
@@ -36,13 +36,13 @@
int speed;
};
+extern E_Module *rain_module;
+
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
-EAPI int e_modapi_about(E_Module *m);
-EAPI int e_modapi_config(E_Module *m);
void _rain_cb_config_updated(void *data);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
