Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : net
Dir : e_modules/net/src
Modified Files:
e_mod_config.c e_mod_config.h e_mod_configure.c e_mod_gadcon.c
e_mod_main.c e_mod_net.c
Log Message:
Fix up net & screenshot modules to play nicely.
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_config.c 16 Sep 2007 03:31:41 -0000 1.11
+++ e_mod_config.c 4 Jan 2008 06:39:21 -0000 1.12
@@ -16,10 +16,10 @@
int num = 0;
/* Create id */
- if (cfg->items)
+ if (net_cfg->items)
{
const char *p;
- ci = evas_list_last(cfg->items)->data;
+ ci = evas_list_last(net_cfg->items)->data;
p = strrchr(ci->id, '.');
if (p) num = atoi(p + 1) + 1;
}
@@ -28,7 +28,7 @@
}
else
{
- for (l = cfg->items; l; l = l->next)
+ for (l = net_cfg->items; l; l = l->next)
{
ci = l->data;
if (!ci->id) continue;
@@ -42,7 +42,7 @@
ci->limit = 0;
ci->show_text = 1;
ci->show_popup = 0;
- cfg->items = evas_list_append(cfg->items, ci);
+ net_cfg->items = evas_list_append(net_cfg->items, ci);
return ci;
}
@@ -102,8 +102,8 @@
{
Evas_List *l;
- if (!cfg) return;
- for (l = cfg->instances; l; l = l->next)
+ if (!net_cfg) return;
+ for (l = net_cfg->instances; l; l = l->next)
{
Instance *inst;
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_config.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_config.h 3 Dec 2007 06:24:25 -0000 1.9
+++ e_mod_config.h 4 Jan 2008 06:39:21 -0000 1.10
@@ -26,6 +26,6 @@
EAPI Ecore_List *_config_devices_get(void);
EAPI void _config_updated(Config_Item *ci);
-extern Config *cfg;
+extern Config *net_cfg;
#endif
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_configure.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_configure.c 12 Nov 2007 11:17:35 -0000 1.13
+++ e_mod_configure.c 4 Jan 2008 06:39:21 -0000 1.14
@@ -38,11 +38,12 @@
v->basic.apply_cfdata = _apply_data;
v->basic.create_widgets = _basic_create;
- snprintf(buf, sizeof(buf), "%s/e-module-net.edj",
e_module_dir_get(cfg->mod));
+ snprintf(buf, sizeof(buf), "%s/e-module-net.edj",
+ e_module_dir_get(net_cfg->mod));
con = e_container_current_get(e_manager_current_get());
cfd = e_config_dialog_new(con, D_("Net Module Configuration"), "Net",
"_netmod_config_dialog", buf, 0, v, ci);
- cfg->cfd = cfd;
+ net_cfg->cfd = cfd;
}
static void *
@@ -64,8 +65,8 @@
E_FREE(cfdata->device);
E_FREE(cfdata->app);
E_FREE(cfdata);
- if (!cfg) return;
- cfg->cfd = NULL;
+ if (!net_cfg) return;
+ net_cfg->cfd = NULL;
}
static void
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_gadcon.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_gadcon.c 16 Sep 2007 03:31:41 -0000 1.9
+++ e_mod_gadcon.c 4 Jan 2008 06:39:21 -0000 1.10
@@ -25,7 +25,7 @@
E_Gadcon_Client *gcc;
char buf[PATH_MAX];
- snprintf(buf, sizeof(buf), "%s/net.edj", e_module_dir_get(cfg->mod));
+ snprintf(buf, sizeof(buf), "%s/net.edj", e_module_dir_get(net_cfg->mod));
inst = E_NEW(Instance, 1);
inst->ci = _config_item_get(id);
@@ -52,8 +52,8 @@
evas_object_event_callback_add(inst->o_net, EVAS_CALLBACK_MOUSE_DOWN,
_cb_mouse_down, inst);
-
- cfg->instances = evas_list_append(cfg->instances, inst);
+
+ net_cfg->instances = evas_list_append(net_cfg->instances, inst);
return gcc;
}
@@ -63,7 +63,7 @@
Instance *inst;
inst = gcc->data;
- cfg->instances = evas_list_remove(cfg->instances, inst);
+ net_cfg->instances = evas_list_remove(net_cfg->instances, inst);
if (inst->timer) ecore_timer_del(inst->timer);
if (inst->o_net)
{
@@ -96,8 +96,9 @@
{
Evas_Object *o;
char buf[PATH_MAX];
-
- snprintf(buf, sizeof(buf), "%s/e-module-net.edj",
e_module_dir_get(cfg->mod));
+
+ snprintf(buf, sizeof(buf), "%s/e-module-net.edj",
+ e_module_dir_get(net_cfg->mod));
o = edje_object_add(evas);
edje_object_file_set(o, buf, "icon");
return o;
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c 2 Dec 2007 16:30:34 -0000 1.12
+++ e_mod_main.c 4 Jan 2008 06:39:21 -0000 1.13
@@ -5,7 +5,7 @@
static E_Config_DD *conf_edd = NULL;
static E_Config_DD *item_edd = NULL;
-Config *cfg = NULL;
+Config *net_cfg = NULL;
EAPI E_Module_Api e_modapi =
{
@@ -32,15 +32,15 @@
conf_edd = E_CONFIG_DD_NEW("Config", Config);
E_CONFIG_LIST(conf_edd, Config, items, item_edd);
- cfg = e_config_domain_load("module.net", conf_edd);
- if (!cfg)
+ net_cfg = e_config_domain_load("module.net", conf_edd);
+ if (!net_cfg)
{
Config_Item *ci;
-
- cfg = E_NEW(Config, 1);
+
+ net_cfg = E_NEW(Config, 1);
ci = _config_item_get("0");
}
- cfg->mod = m;
+ net_cfg->mod = m;
_gc_register();
return m;
}
@@ -48,30 +48,30 @@
EAPI int
e_modapi_shutdown(E_Module *m)
{
- cfg->mod = NULL;
_gc_unregister();
+ net_cfg->mod = NULL;
- if (cfg->cfd) e_object_del(E_OBJECT(cfg->cfd));
- if (cfg->menu)
+ if (net_cfg->cfd) e_object_del(E_OBJECT(net_cfg->cfd));
+ if (net_cfg->menu)
{
- e_menu_post_deactivate_callback_set(cfg->menu, NULL, NULL);
- e_object_del(E_OBJECT(cfg->menu));
- cfg->menu = NULL;
+ e_menu_post_deactivate_callback_set(net_cfg->menu, NULL, NULL);
+ e_object_del(E_OBJECT(net_cfg->menu));
+ net_cfg->menu = NULL;
}
- while (cfg->items)
+ while (net_cfg->items)
{
Config_Item *ci;
-
- ci = cfg->items->data;
+
+ ci = net_cfg->items->data;
if (ci->id) evas_stringshare_del(ci->id);
if (ci->device) evas_stringshare_del(ci->device);
if (ci->app) evas_stringshare_del(ci->app);
- cfg->items = evas_list_remove_list(cfg->items, cfg->items);
+ net_cfg->items = evas_list_remove_list(net_cfg->items, net_cfg->items);
E_FREE(ci);
}
- E_FREE(cfg);
+ E_FREE(net_cfg);
E_CONFIG_DD_FREE(item_edd);
E_CONFIG_DD_FREE(conf_edd);
return 1;
@@ -80,6 +80,6 @@
EAPI int
e_modapi_save(E_Module *m)
{
- e_config_domain_save("module.net", conf_edd, cfg);
+ e_config_domain_save("module.net", conf_edd, net_cfg);
return 1;
}
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_net.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_net.c 2 Dec 2007 16:30:34 -0000 1.19
+++ e_mod_net.c 4 Jan 2008 06:39:21 -0000 1.20
@@ -152,9 +152,9 @@
if (x) ecore_exe_free(x);
}
}
- else if ((ev->button == 1) && (!cfg->menu))
+ else if ((ev->button == 1) && (!net_cfg->menu))
e_gadcon_popup_toggle_pinned(inst->popup);
- else if ((ev->button == 3) && (!cfg->menu))
+ else if ((ev->button == 3) && (!net_cfg->menu))
{
E_Menu *mn;
E_Menu_Item *mi;
@@ -162,7 +162,7 @@
mn = e_menu_new();
e_menu_post_deactivate_callback_set(mn, _cb_post, inst);
- cfg->menu = mn;
+ net_cfg->menu = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_("Configuration"));
@@ -195,7 +195,7 @@
if (!inst->ci->show_popup) return;
inst->popup = e_gadcon_popup_new(inst->gcc, NULL);
- snprintf(buf, sizeof(buf), "%s/net.edj", e_module_dir_get(cfg->mod));
+ snprintf(buf, sizeof(buf), "%s/net.edj", e_module_dir_get(net_cfg->mod));
bg = edje_object_add(inst->popup->win->evas);
if (!e_theme_edje_object_set(bg, "base/theme/modules",
@@ -242,10 +242,10 @@
static void
_cb_post(void *data, E_Menu *m)
{
- if (!cfg->menu) return;
- e_menu_post_deactivate_callback_set(cfg->menu, NULL, NULL);
- e_object_del(E_OBJECT(cfg->menu));
- cfg->menu = NULL;
+ if (!net_cfg->menu) return;
+ e_menu_post_deactivate_callback_set(net_cfg->menu, NULL, NULL);
+ e_object_del(E_OBJECT(net_cfg->menu));
+ net_cfg->menu = NULL;
}
static void
-------------------------------------------------------------------------
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
