vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename _Name to _e_mixer_Name, avoiding sym clash 

SVN revision: 44993
This commit is contained in:
Gustavo Sverzut Barbieri 2010-01-08 21:43:27 +00:00
parent 7367354419
commit 271862f5c0
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/mixer/app_mixer.c
View File

@ -1,6 +1,6 @@
#include "e_mod_main.h" #include "e_mod_main.h"
extern const char _Name[]; extern const char _e_mixer_Name[];
typedef struct E_Mixer_App_Dialog_Data typedef struct E_Mixer_App_Dialog_Data
{ {
@ -506,7 +506,7 @@ e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog, void *da
E_Mixer_App_Dialog_Data *app; E_Mixer_App_Dialog_Data *app;
E_Dialog *dialog; E_Dialog *dialog;
dialog = e_dialog_new(con, _Name, "e_mixer_app_dialog"); dialog = e_dialog_new(con, _e_mixer_Name, "e_mixer_app_dialog");
if (!dialog) if (!dialog)
return NULL; return NULL;
@ -521,7 +521,7 @@ e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog, void *da
app->del.data = data; app->del.data = data;
app->del.func = func; app->del.func = func;
e_dialog_title_set(dialog, _(_Name)); e_dialog_title_set(dialog, _(_e_mixer_Name));
e_dialog_resizable_set(dialog, 1); e_dialog_resizable_set(dialog, 1);
e_win_delete_callback_set(dialog->win, _cb_win_del); e_win_delete_callback_set(dialog->win, _cb_win_del);

6
src/modules/mixer/conf_gadget.c
View File

@ -1,6 +1,6 @@
#include "e_mod_main.h" #include "e_mod_main.h"
extern const char _Name[]; extern const char _e_mixer_Name[];
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
@ -362,7 +362,7 @@ e_mixer_config_dialog_new(E_Container *con, E_Mixer_Gadget_Config *conf)
E_Config_Dialog *dialog; E_Config_Dialog *dialog;
E_Config_Dialog_View *view; E_Config_Dialog_View *view;
if (e_config_dialog_find(_Name, "e_mixer_config_dialog_new")) if (e_config_dialog_find(_e_mixer_Name, "e_mixer_config_dialog_new"))
return NULL; return NULL;
view = E_NEW(E_Config_Dialog_View, 1); view = E_NEW(E_Config_Dialog_View, 1);
@ -375,7 +375,7 @@ e_mixer_config_dialog_new(E_Container *con, E_Mixer_Gadget_Config *conf)
view->basic.apply_cfdata = _basic_apply; view->basic.apply_cfdata = _basic_apply;
dialog = e_config_dialog_new(con, _("Mixer Settings"), dialog = e_config_dialog_new(con, _("Mixer Settings"),
_Name, "e_mixer_config_dialog_new", _e_mixer_Name, "e_mixer_config_dialog_new",
e_mixer_theme_path(), 0, view, conf); e_mixer_theme_path(), 0, view, conf);
e_dialog_resizable_set(dialog->dia, 1); e_dialog_resizable_set(dialog->dia, 1);

6
src/modules/mixer/conf_module.c
View File

@ -1,6 +1,6 @@
#include "e_mod_main.h" #include "e_mod_main.h"
extern const char _Name[]; extern const char _e_mixer_Name[];
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
@ -172,7 +172,7 @@ e_mixer_config_module_dialog_new(E_Container *con, E_Mixer_Module_Context *ctxt)
E_Config_Dialog *dialog; E_Config_Dialog *dialog;
E_Config_Dialog_View *view; E_Config_Dialog_View *view;
if (e_config_dialog_find(_Name, "extensions/mixer")) if (e_config_dialog_find(_e_mixer_Name, "extensions/mixer"))
return NULL; return NULL;
view = E_NEW(E_Config_Dialog_View, 1); view = E_NEW(E_Config_Dialog_View, 1);
@ -185,7 +185,7 @@ e_mixer_config_module_dialog_new(E_Container *con, E_Mixer_Module_Context *ctxt)
view->basic.apply_cfdata = _basic_apply; view->basic.apply_cfdata = _basic_apply;
dialog = e_config_dialog_new(con, _("Mixer Module Settings"), dialog = e_config_dialog_new(con, _("Mixer Module Settings"),
_Name, "extensions/mixer", _e_mixer_Name, "extensions/mixer",
e_mixer_theme_path(), 0, view, ctxt); e_mixer_theme_path(), 0, view, ctxt);
return dialog; return dialog;

24
src/modules/mixer/e_mod_main.c
View File

@ -6,7 +6,7 @@ static char tmpbuf[PATH_MAX]; /* general purpose buffer, just use immediately */
static const char _conf_domain[] = "module.mixer"; static const char _conf_domain[] = "module.mixer";
static const char _name[] = "mixer"; static const char _name[] = "mixer";
const char _Name[] = "Mixer"; const char _e_mixer_Name[] = "Mixer";
const char * const char *
e_mixer_theme_path(void) e_mixer_theme_path(void)
@ -952,7 +952,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
static char * static char *
_gc_label(E_Gadcon_Client_Class *client_class) _gc_label(E_Gadcon_Client_Class *client_class)
{ {
return _(_Name); return _(_e_mixer_Name);
} }
static Evas_Object * static Evas_Object *
@ -995,7 +995,7 @@ static const E_Gadcon_Client_Class _gc_class =
EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _Name}; EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_mixer_Name};
static void static void
_mixer_cb_volume_increase(E_Object *obj, const char *params) _mixer_cb_volume_increase(E_Object *obj, const char *params)
@ -1079,7 +1079,7 @@ _mixer_configure_registry_register(void)
{ {
e_configure_registry_category_add(_reg_cat, 90, _("Extensions"), NULL, e_configure_registry_category_add(_reg_cat, 90, _("Extensions"), NULL,
"preferences-extensions"); "preferences-extensions");
e_configure_registry_item_add(_reg_item, 30, _(_Name), NULL, e_configure_registry_item_add(_reg_item, 30, _(_e_mixer_Name), NULL,
"preferences-desktop-mixer", "preferences-desktop-mixer",
_mixer_module_config); _mixer_module_config);
} }
@ -1190,23 +1190,23 @@ _mixer_actions_register(E_Mixer_Module_Context *ctxt)
if (ctxt->actions.incr) if (ctxt->actions.incr)
{ {
ctxt->actions.incr->func.go = _mixer_cb_volume_increase; ctxt->actions.incr->func.go = _mixer_cb_volume_increase;
e_action_predef_name_set(_(_Name), _(_lbl_increase), _act_increase, e_action_predef_name_set(_(_e_mixer_Name), _(_lbl_increase),
NULL, NULL, 0); _act_increase, NULL, NULL, 0);
} }
ctxt->actions.decr = e_action_add(_act_decrease); ctxt->actions.decr = e_action_add(_act_decrease);
if (ctxt->actions.decr) if (ctxt->actions.decr)
{ {
ctxt->actions.decr->func.go = _mixer_cb_volume_decrease; ctxt->actions.decr->func.go = _mixer_cb_volume_decrease;
e_action_predef_name_set(_(_Name), _(_lbl_decrease), _act_decrease, e_action_predef_name_set(_(_e_mixer_Name), _(_lbl_decrease),
NULL, NULL, 0); _act_decrease, NULL, NULL, 0);
} }
ctxt->actions.mute = e_action_add(_act_mute); ctxt->actions.mute = e_action_add(_act_mute);
if (ctxt->actions.mute) if (ctxt->actions.mute)
{ {
ctxt->actions.mute->func.go = _mixer_cb_volume_mute; ctxt->actions.mute->func.go = _mixer_cb_volume_mute;
e_action_predef_name_set(_(_Name), _(_lbl_mute), _act_mute, e_action_predef_name_set(_(_e_mixer_Name), _(_lbl_mute), _act_mute,
NULL, NULL, 0); NULL, NULL, 0);
} }
} }
@ -1216,19 +1216,19 @@ _mixer_actions_unregister(E_Mixer_Module_Context *ctxt)
{ {
if (ctxt->actions.incr) if (ctxt->actions.incr)
{ {
e_action_predef_name_del(_(_Name), _(_lbl_increase)); e_action_predef_name_del(_(_e_mixer_Name), _(_lbl_increase));
e_action_del(_act_increase); e_action_del(_act_increase);
} }
if (ctxt->actions.decr) if (ctxt->actions.decr)
{ {
e_action_predef_name_del(_(_Name), _(_lbl_decrease)); e_action_predef_name_del(_(_e_mixer_Name), _(_lbl_decrease));
e_action_del(_act_decrease); e_action_del(_act_decrease);
} }
if (ctxt->actions.mute) if (ctxt->actions.mute)
{ {
e_action_predef_name_del(_(_Name), _(_lbl_mute)); e_action_predef_name_del(_(_e_mixer_Name), _(_lbl_mute));
e_action_del(_act_mute); e_action_del(_act_mute);
} }
} }