Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e
Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c e_mod_main.h Log Message: We need id's for gadgets which are independent of shelves, so if we move a gadget from one shelf to another it will keep the same config. Since the id is mainly for the module to find the appropriate config for a gadget, the module is now responsible for creating id's for gadgets config. One problem is that we no longer can trust the id of a gadget, so we need to store a reference between a gadget and its config after startup. No big deal. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.217 retrieving revision 1.218 diff -u -3 -r1.217 -r1.218 --- e_mod_main.c 6 Aug 2007 23:35:13 -0000 1.217 +++ e_mod_main.c 16 Sep 2007 00:02:53 -0000 1.218 @@ -12,13 +12,14 @@ 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); /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, "pager", { - _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon + _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL }, E_GADCON_CLIENT_STYLE_INSET }; @@ -250,6 +251,13 @@ edje_object_file_set(o, buf, "icon"); return o; } + +static const char * +_gc_id_new(void) +{ + return _gadcon_class.name; +} + /**/ /***************************************************************************/ =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.h,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- e_mod_main.h 15 Jul 2007 08:28:04 -0000 1.51 +++ e_mod_main.h 16 Sep 2007 00:02:53 -0000 1.52 @@ -29,7 +29,6 @@ unsigned int drag_resist; unsigned int scale; unsigned char resize; - Evas_List *items; /* FIXME: save/load this */ /* just config state */ E_Module *module; E_Config_Dialog *config_dialog; @@ -41,12 +40,6 @@ unsigned int btn_noplace; unsigned int btn_desk; unsigned int flip_desk; -}; - -struct _Config_Item -{ - char *id; - int zone_num; }; EAPI extern E_Module_Api e_modapi; ------------------------------------------------------------------------- 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