Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c e_gadcon.h
Log Message:
Revert to old e_gadcon_client_new, some modules require id to be set on
the gadcon client after this func returns.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- e_gadcon.c 30 Dec 2006 22:31:28 -0000 1.59
+++ e_gadcon.c 30 Dec 2006 23:32:24 -0000 1.60
@@ -371,8 +371,10 @@
if (gcc)
{
+#if 0
gcc->name = evas_stringshare_add(cf_gcc->name);
gcc->id = evas_stringshare_add(cf_gcc->id);
+#endif
gcc->client_class = cc;
gcc->config.pos = cf_gcc->geom.pos;
gcc->config.size = cf_gcc->geom.size;
@@ -440,8 +442,10 @@
cf_gcc->style);
if (gcc)
{
+#if 0
gcc->name = evas_stringshare_add(cf_gcc->name);
gcc->id = evas_stringshare_add(cf_gcc->id);
+#endif
gcc->client_class = cc;
gcc->config.pos = cf_gcc->geom.pos;
gcc->config.size = cf_gcc->geom.size;
@@ -739,7 +743,7 @@
}
EAPI E_Gadcon_Client *
-e_gadcon_client_new(E_Gadcon *gc, const char *style, Evas_Object *base_obj)
+e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char
*style, Evas_Object *base_obj)
{
E_Gadcon_Client *gcc;
@@ -747,6 +751,8 @@
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
gcc = E_OBJECT_ALLOC(E_Gadcon_Client, E_GADCON_CLIENT_TYPE,
_e_gadcon_client_free);
if (!gcc) return NULL;
+ gcc->name = evas_stringshare_add(name);
+ gcc->id = evas_stringshare_add(id);
gcc->gadcon = gc;
gcc->o_base = base_obj;
gc->clients = evas_list_append(gc->clients, gcc);
@@ -1547,7 +1553,6 @@
Evas_Coord w, h;
e_gadcon_layout_asked_size_get(gc->o_container, &w, &h);
-
gc->resize_request.func(gc->resize_request.data, gc, w, h);
}
evas_object_geometry_get(gc->o_container, &x, &y, &w, &h);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_gadcon.h 30 Dec 2006 22:31:28 -0000 1.33
+++ e_gadcon.h 30 Dec 2006 23:32:24 -0000 1.34
@@ -183,7 +183,7 @@
EAPI E_Config_Gadcon_Client *e_gadcon_client_config_new(E_Gadcon *gc, const
char *name);
EAPI E_Config_Gadcon_Client *e_gadcon_client_config_get(E_Gadcon *gc, const
char *name, const char *id);
EAPI void e_gadcon_client_config_del(E_Gadcon *gc, const char *id);
-EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *style,
Evas_Object *base_obj);
+EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *name,
const char *id, const char *style, Evas_Object *base_obj);
EAPI void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc);
EAPI void e_gadcon_client_edit_end(E_Gadcon_Client *gcc);
EAPI void e_gadcon_client_size_request(E_Gadcon_Client *gcc,
Evas_Coord w, Evas_Coord h);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
