Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : flame
Dir : e_modules/flame
Modified Files:
e_mod_main.c e_mod_config.c
Log Message:
Update to use new e_modapi_config
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/flame/e_mod_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.c 12 Dec 2005 15:48:55 -0000 1.2
+++ e_mod_main.c 17 Dec 2005 21:43:50 -0000 1.3
@@ -98,6 +98,19 @@
return 1;
}
+int
+e_modapi_config(E_Module *m)
+{
+ Flame *f;
+ E_Container *con;
+
+ f = m->data;
+ if (!f) return 0;
+ con = e_container_current_get(e_manager_current_get());
+ e_int_config_flame(con, f);
+ return 1;
+}
+
/* module private routines */
static Flame *
_flame_init (E_Module *m)
@@ -188,7 +201,7 @@
mn = e_menu_new ();
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, "Config Dialog");
+ e_menu_item_label_set(mi, _("Config Dialog"));
e_menu_item_callback_set(mi, _flame_menu_cb_configure, f);
f->config_menu = mn;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/flame/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 16 Dec 2005 17:55:10 -0000 1.2
+++ e_mod_config.c 17 Dec 2005 21:43:50 -0000 1.3
@@ -7,9 +7,6 @@
struct _cfdata
{
- Flame *fl;
-
- /* Basic */
int palette;
};
@@ -26,16 +23,12 @@
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-Flame *f = NULL;
-
void
e_int_config_flame(E_Container *con, Flame *fl)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
- f = fl;
-
v.create_cfdata = _create_data;
v.free_cfdata = _free_data;
v.basic.apply_cfdata = _basic_apply_data;
@@ -47,7 +40,7 @@
}
static void
-_fill_data(CFData *cfdata)
+_fill_data(Flame *f, CFData *cfdata)
{
cfdata->palette = f->conf->palette_type;
}
@@ -56,9 +49,11 @@
*_create_data(E_Config_Dialog *cfd)
{
CFData *cfdata;
+ Flame *f;
+ f = cfd->data;
cfdata = E_NEW(CFData, 1);
- _fill_data(cfdata);
+ _fill_data(f, cfdata);
return cfdata;
}
@@ -90,6 +85,9 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
+ Flame *f;
+
+ f = cfd->data;
e_border_button_bindings_ungrab_all();
switch (cfdata->palette)
{
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
