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

Remove duplicate code. 

SVN revision: 31735
This commit is contained in:
Sebastian Dransfeld 2007-09-16 02:23:32 +00:00
parent b0f8888510
commit 205fd652a2
2 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,10 +451,10 @@ _ibar_config_item_get(const char *id)
{
Evas_List *l;
Config_Item *ci;
char buf[128];
if (!id)
{
char buf[128];
int num = 0;
/* Create id */
@ -466,13 +466,7 @@ _ibar_config_item_get(const char *id)
if (p) num = atoi(p + 1) + 1;
}
snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, num);
/* Create new config */
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(buf);
ci->show_label = 1;
ci->eap_label = 0;
ibar_config->items = evas_list_append(ibar_config->items, ci);
id = buf;
}
else
{
@ -483,12 +477,12 @@ _ibar_config_item_get(const char *id)
if ((ci->id) && (ci->dir) && (!strcmp(ci->id, id)))
return ci;
}
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id);
ci->show_label = 1;
ci->eap_label = 0;
ibar_config->items = evas_list_append(ibar_config->items, ci);
}
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id);
ci->show_label = 1;
ci->eap_label = 0;
ibar_config->items = evas_list_append(ibar_config->items, ci);
return ci;
}

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

@ -1244,9 +1244,10 @@ _ibox_config_item_get(const char *id)
{
Evas_List *l;
Config_Item *ci;
char buf[128];
if (!id)
{
char buf[128];
int num = 0;
/* Create id */
@ -1258,15 +1259,7 @@ _ibox_config_item_get(const char *id)
if (p) num = atoi(p + 1) + 1;
}
snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, num);
/* Create new config */
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(buf);
ci->show_label = 0;
ci->show_zone = 1;
ci->show_desk = 0;
ci->icon_label = 0;
ibox_config->items = evas_list_append(ibox_config->items, ci);
id = buf;
}
else
{
@ -1277,14 +1270,14 @@ _ibox_config_item_get(const char *id)
if ((ci->id) && (!strcmp(ci->id, id)))
return ci;
}
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id);
ci->show_label = 0;
ci->show_zone = 1;
ci->show_desk = 0;
ci->icon_label = 0;
ibox_config->items = evas_list_append(ibox_config->items, ci);
}
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id);
ci->show_label = 0;
ci->show_zone = 1;
ci->show_desk = 0;
ci->icon_label = 0;
ibox_config->items = evas_list_append(ibox_config->items, ci);
return ci;
}