|
From: Enlightenment C. <no...@cv...> - 2007-09-16 10:51:19
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
simplify
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -3 -r1.183 -r1.184
--- e_mod_main.c 16 Sep 2007 02:23:32 -0000 1.183
+++ e_mod_main.c 16 Sep 2007 10:51:17 -0000 1.184
@@ -121,6 +121,8 @@
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 @@
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 @@
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,
|