From 27264671d0ff47ac8876b27bc8ef4467e264c152 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Mon, 14 Nov 2011 21:46:57 +0000 Subject: [PATCH] e/gadcon: label() returns a const char* Original patch by Fabien Romano from OpenBSD SVN revision: 65204 --- src/bin/e_gadcon.h | 2 +- src/modules/backlight/e_mod_main.c | 4 ++-- src/modules/battery/e_mod_main.c | 4 ++-- src/modules/clock/e_mod_main.c | 4 ++-- src/modules/conf/e_mod_main.c | 4 ++-- src/modules/cpufreq/e_mod_main.c | 4 ++-- src/modules/everything/evry_gadget.c | 4 ++-- src/modules/fileman/e_fwin_nav.c | 4 ++-- src/modules/ibar/e_mod_main.c | 4 ++-- src/modules/ibox/e_mod_main.c | 4 ++-- src/modules/illume-bluetooth/e_mod_main.c | 4 ++-- src/modules/illume-home-toggle/e_mod_main.c | 4 ++-- src/modules/illume-kbd-toggle/e_mod_main.c | 4 ++-- src/modules/pager/e_mod_main.c | 4 ++-- src/modules/start/e_mod_main.c | 4 ++-- src/modules/tasks/e_mod_main.c | 4 ++-- src/modules/temperature/e_mod_main.c | 4 ++-- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h index 58a02df..94ce3dd 100644 --- a/src/bin/e_gadcon.h +++ b/src/bin/e_gadcon.h @@ -134,7 +134,7 @@ struct _E_Gadcon_Client_Class E_Gadcon_Client *(*init) (E_Gadcon *gc, const char *name, const char *id, const char *style); void (*shutdown) (E_Gadcon_Client *gcc); void (*orient) (E_Gadcon_Client *gcc, E_Gadcon_Orient orient); - char *(*label) (E_Gadcon_Client_Class *client_class); + const char *(*label) (E_Gadcon_Client_Class *client_class); Evas_Object *(*icon) (E_Gadcon_Client_Class *client_class, Evas *evas); /* All members below are part of version 2 */ /* Create new id, so that the gadcon client can refer to a config set inside the module */ diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c index ad9d5c2..628a282 100644 --- a/src/modules/backlight/e_mod_main.c +++ b/src/modules/backlight/e_mod_main.c @@ -5,7 +5,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); @@ -437,7 +437,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, mw, mh); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Backlight"); diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index 40c51cd..e6366a3 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -5,7 +5,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); @@ -139,7 +139,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, mw, mh); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Battery"); diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index 9fa513f..c68ac9d 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -8,7 +8,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static Config_Item *_conf_item_get(const char *id); @@ -646,7 +646,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) _eval_instance_size(gcc->data); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Clock"); diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index a92b8bd..ba5109a 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -20,7 +20,7 @@ static void _config_pre_activate_cb(void *data, E_Menu *m); static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static void _cb_action_conf(void *data, Evas_Object *obj, const char *emission, const char *source); @@ -96,7 +96,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, mw, mh); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Settings"); diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index 10a2b33..fd09b41 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -10,7 +10,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); /* and actually define the gadcon class that this module provides (just 1) */ @@ -126,7 +126,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, 16, 16); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Cpufreq"); diff --git a/src/modules/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c index 55417b2..f8e2325 100644 --- a/src/modules/everything/evry_gadget.c +++ b/src/modules/everything/evry_gadget.c @@ -36,7 +36,7 @@ static Eina_Bool _cb_focus_out(void *data, int type __UNUSED__, void *event); static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static Gadget_Config *_conf_item_get(const char *id); @@ -165,7 +165,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, mw, mh); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Everything Starter"); diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c index 1540f59..e1a11da 100644 --- a/src/modules/fileman/e_fwin_nav.c +++ b/src/modules/fileman/e_fwin_nav.c @@ -26,7 +26,7 @@ struct _Instance static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); @@ -253,7 +253,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) /* e_gadcon_client_min_size_set(gcc, 16, 16); */ } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("EFM Navigation"); diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 1d3aa72..7d4ddd9 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -13,7 +13,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id); @@ -205,7 +205,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) e_gadcon_client_min_size_set(gcc, 16, 16); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("IBar"); diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index ccc8463..70de870 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -5,7 +5,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id); @@ -210,7 +210,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) e_gadcon_client_min_size_set(gcc, 16, 16); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("IBox"); diff --git a/src/modules/illume-bluetooth/e_mod_main.c b/src/modules/illume-bluetooth/e_mod_main.c index bb8ab7d..dda513c 100644 --- a/src/modules/illume-bluetooth/e_mod_main.c +++ b/src/modules/illume-bluetooth/e_mod_main.c @@ -14,7 +14,7 @@ struct _Instance static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *cc); +static const char *_gc_label(E_Gadcon_Client_Class *cc); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *cc); static Eina_Bool _cb_poll(void *data); @@ -89,7 +89,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, mw, mh); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *cc __UNUSED__) { return _("Illume Bluetooth"); diff --git a/src/modules/illume-home-toggle/e_mod_main.c b/src/modules/illume-home-toggle/e_mod_main.c index bf7a5ed..9d33f53 100644 --- a/src/modules/illume-home-toggle/e_mod_main.c +++ b/src/modules/illume-home-toggle/e_mod_main.c @@ -12,7 +12,7 @@ struct _Instance static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *cc); +static const char *_gc_label(E_Gadcon_Client_Class *cc); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *cc); static void _cb_action_home(void *data, Evas_Object *obj, const char *emission, const char *source); @@ -95,7 +95,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, 16, 16); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *cc __UNUSED__) { return _("Illume-Home-Toggle"); diff --git a/src/modules/illume-kbd-toggle/e_mod_main.c b/src/modules/illume-kbd-toggle/e_mod_main.c index 79a6176..6f9b5d0 100644 --- a/src/modules/illume-kbd-toggle/e_mod_main.c +++ b/src/modules/illume-kbd-toggle/e_mod_main.c @@ -14,7 +14,7 @@ struct _Instance static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *cc); +static const char *_gc_label(E_Gadcon_Client_Class *cc); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *cc); static void _cb_action_vkbd_enable(void *data, Evas_Object *obj, const char *emission, const char *source); @@ -120,7 +120,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, 16, 16); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *cc __UNUSED__) { return _("Illume-Keyboard-Toggle"); diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 65273e2..ec2ec1b 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -5,7 +5,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__); -static char *_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__); +static const char *_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__); @@ -251,7 +251,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, 16, 16); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Pager"); diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c index 7eff93f..0af991f 100644 --- a/src/modules/start/e_mod_main.c +++ b/src/modules/start/e_mod_main.c @@ -5,7 +5,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); /* and actually define the gadcon class that this module provides (just 1) */ @@ -96,7 +96,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, mw, mh); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Start"); diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index 37f1249..85e59c1 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -7,7 +7,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); @@ -299,7 +299,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) e_box_align_set(tasks->o_items, 0.5, 0.5); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Tasks"); diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 0d061db..b5b2fb1 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -17,7 +17,7 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static char *_gc_label(E_Gadcon_Client_Class *client_class); +static const char *_gc_label(E_Gadcon_Client_Class *client_class); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); /* and actually define the gadcon class that this module provides (just 1) */ @@ -170,7 +170,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) e_gadcon_client_min_size_set(gcc, 16, 16); } -static char * +static const char * _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__) { return _("Temperature"); -- 2.7.4