Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c
Log Message:
Implement id_new()
===================================================================
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_mod_main.c 16 Sep 2007 01:46:50 -0000 1.45
+++ e_mod_main.c 16 Sep 2007 03:31:40 -0000 1.46
@@ -26,6 +26,7 @@
static void _gc_orient (E_Gadcon_Client * gcc);
static char *_gc_label (void);
static Evas_Object *_gc_icon (Evas * evas);
+static const char *_gc_id_new (void);
/* Func Protos for Module */
static void _mem_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
@@ -48,7 +49,7 @@
static const E_Gadcon_Client_Class _gc_class = {
GADCON_CLIENT_CLASS_VERSION,
- "mem", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon},
+ "mem", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new,
NULL},
E_GADCON_CLIENT_STYLE_PLAIN
};
@@ -63,8 +64,6 @@
inst = E_NEW (Instance, 1);
inst->ci = _mem_config_item_get (id);
- if (!inst->ci->id)
- inst->ci->id = evas_stringshare_add (id);
mem = _mem_new (gc->evas);
mem->inst = inst;
@@ -119,6 +118,15 @@
return o;
}
+static const char *
+_gc_id_new (void)
+{
+ Config_Item *ci;
+
+ ci = _mem_config_item_get (NULL);
+ return ci->id;
+}
+
static void
_gc_shutdown (E_Gadcon_Client * gcc)
{
@@ -217,17 +225,36 @@
static Config_Item *
_mem_config_item_get (const char *id)
{
- Evas_List *l;
- Config_Item *ci;
-
- for (l = mem_config->items; l; l = l->next)
- {
- ci = l->data;
- if (!ci->id)
- continue;
- if (!strcmp (ci->id, id))
- return ci;
- }
+ Evas_List *l;
+ Config_Item *ci;
+ char buf[128];
+
+ if (!id)
+ {
+ int num = 0;
+
+ /* Create id */
+ if (mem_config->items)
+ {
+ const char *p;
+ ci = evas_list_last (mem_config->items)->data;
+ p = strrchr (ci->id, '.');
+ if (p) num = atoi (p + 1) + 1;
+ }
+ snprintf (buf, sizeof (buf), "%s.%d", _gc_class.name, num);
+ id = buf;
+ }
+ else
+ {
+ for (l = mem_config->items; l; l = l->next)
+ {
+ ci = l->data;
+ if (!ci->id)
+ continue;
+ if (!strcmp (ci->id, id))
+ return ci;
+ }
+ }
ci = E_NEW (Config_Item, 1);
ci->id = evas_stringshare_add (id);
ci->poll_time = 1.0;
-------------------------------------------------------------------------
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
