fix the same instance id bug as in pager, this will likely delete configs for a large number of modules

SVN revision: 72592
This commit is contained in:
Mike Blumenkrantz 2012-06-21 11:03:50 +00:00
parent f00c71c743
commit 7dbd2e8de9
7 changed files with 37 additions and 19 deletions

View File

@ -457,7 +457,11 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
{ {
return _gadcon_class.name; char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
eina_list_count(backlight_instances));
return strdup(buf);
} }
static void static void

View File

@ -165,9 +165,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
} }
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) _gc_id_new(E_Gadcon_Client_Class *client_class)
{ {
return _gadcon_class.name; char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
eina_list_count(battery_config->instances));
return strdup(buf);
} }
static void static void

View File

@ -677,12 +677,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) _gc_id_new(E_Gadcon_Client_Class *client_class)
{ {
Config_Item *ci = NULL; char buf[PATH_MAX];
ci = _conf_item_get(NULL); snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
return ci->id; eina_list_count(clock_instances));
return strdup(buf);
} }
static Config_Item * static Config_Item *

View File

@ -201,10 +201,13 @@ _conf_item_get(const char *id)
} }
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) _gc_id_new(E_Gadcon_Client_Class *client_class)
{ {
Gadget_Config *gc = _conf_item_get(NULL); char buf[PATH_MAX];
return gc->id;
snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
eina_inlist_count(instances));
return strdup(buf);
} }
/***************************************************************************/ /***************************************************************************/

View File

@ -227,10 +227,11 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
{ {
Config_Item *ci; char buf[PATH_MAX];
ci = _ibar_config_item_get(NULL); snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
return ci->id; eina_list_count(ibar_config->instances));
return strdup(buf);
} }
static void static void

View File

@ -230,12 +230,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
} }
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) _gc_id_new(E_Gadcon_Client_Class *client_class)
{ {
Config_Item *ci; char buf[PATH_MAX];
ci = _ibox_config_item_get(NULL); snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
return ci->id; eina_list_count(ibox_config->instances));
return strdup(buf);
} }
static void static void

View File

@ -255,9 +255,13 @@ _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
} }
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__) _gc_id_new(E_Gadcon_Client_Class *client_class)
{ {
return _gc_class.name; char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
eina_list_count(instances));
return strdup(buf);
} }
static Evas_Object * static Evas_Object *