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

SVN revision: 72592

src/modules/backlight/e_mod_main.c

@@ -457,7 +457,11 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 static const char *
 _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

src/modules/battery/e_mod_main.c

@@ -165,9 +165,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 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

src/modules/clock/e_mod_main.c

@@ -677,12 +677,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 
 
 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);
-   return ci->id;
+   snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
+            eina_list_count(clock_instances));
+   return strdup(buf);
 }
 
 static Config_Item *

src/modules/everything/evry_gadget.c

@@ -201,10 +201,13 @@ _conf_item_get(const char *id)
 }
 
 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);
-   return gc->id;
+   char buf[PATH_MAX];
+
+   snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
+            eina_inlist_count(instances));
+   return strdup(buf);
 }
 
 /***************************************************************************/

src/modules/ibar/e_mod_main.c

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

src/modules/ibox/e_mod_main.c

@@ -230,12 +230,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 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);
-   return ci->id;
+   snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
+            eina_list_count(ibox_config->instances));
+   return strdup(buf);
 }
 
 static void

src/modules/xkbswitch/e_mod_main.c

@@ -255,9 +255,13 @@ _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 }
 
 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 *