enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

simplify 

SVN revision: 31738
This commit is contained in:
Sebastian Dransfeld 2007-09-16 10:51:17 +00:00
parent 73801f3455
commit ff2c5f7e54
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/ibar/e_mod_main.c
View File

@ -121,6 +121,8 @@ static int _ibar_cb_config_icon_theme(void *data, int ev_type, void *ev);
static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_item_edd = NULL;
static int uuid = 0;
Config *ibar_config = NULL;
static E_Gadcon_Client *
@ -455,17 +457,7 @@ _ibar_config_item_get(const char *id)
if (!id)
{
int num = 0;
/* Create id */
if (ibar_config->items)
{
const char *p;
ci = evas_list_last(ibar_config->items)->data;
p = strrchr(ci->id, '.');
if (p) num = atoi(p + 1) + 1;
}
snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, num);
snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, ++uuid);
id = buf;
}
else
@ -1204,7 +1196,17 @@ e_modapi_init(E_Module *m)
ci->eap_label = 0;
ibar_config->items = evas_list_append(ibar_config->items, ci);
}
else
{
Config_Item *ci;
const char *p;
/* Init uuid */
ci = evas_list_last(ibar_config->items)->data;
p = strrchr(ci->id, '.');
if (p) uuid = atoi(p + 1);
}
ibar_config->module = m;
ibar_config->handlers = evas_list_append(ibar_config->handlers,

26
src/modules/ibox/e_mod_main.c
View File

@ -123,6 +123,8 @@ static Config_Item *_ibox_config_item_get(const char *id);
static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_item_edd = NULL;
static int uuid = 0;
Config *ibox_config = NULL;
static E_Gadcon_Client *
@ -1248,22 +1250,12 @@ _ibox_config_item_get(const char *id)
if (!id)
{
int num = 0;
/* Create id */
if (ibox_config->items)
{
const char *p;
ci = evas_list_last(ibox_config->items)->data;
p = strrchr(ci->id, '.');
if (p) num = atoi(p + 1) + 1;
}
snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, num);
snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, ++uuid);
id = buf;
}
else
{
/* Find old config, or reuse supplied id */
/* Find old config */
for (l = ibox_config->items; l; l = l->next)
{
ci = l->data;
@ -1367,6 +1359,16 @@ e_modapi_init(E_Module *m)
ci->icon_label = 0;
ibox_config->items = evas_list_append(ibox_config->items, ci);
}
else
{
Config_Item *ci;
const char *p;
/* Init uuid */
ci = evas_list_last(ibox_config->items)->data;
p = strrchr(ci->id, '.');
if (p) uuid = atoi(p + 1);
}
ibox_config->module = m;