Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c
Log Message:
simplify
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- e_mod_main.c 16 Sep 2007 02:23:32 -0000 1.87
+++ e_mod_main.c 16 Sep 2007 10:50:46 -0000 1.88
@@ -123,6 +123,8 @@
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 @@
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;
@@ -1366,6 +1358,16 @@
ci->show_desk = 0;
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;
-------------------------------------------------------------------------
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
