forked from enlightenment/enlightenment
Rename e_int_config calls to avoid E namespace conflicts
SVN revision: 19105
This commit is contained in:
parent
47b9eeeaa1
commit
517eb4c9cf
|
@ -28,7 +28,7 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
|
||||||
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
|
|
||||||
void
|
void
|
||||||
e_int_config_battery(E_Container *con, Battery *bat)
|
_config_battery_module(E_Container *con, Battery *bat)
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
E_Config_Dialog_View v;
|
E_Config_Dialog_View v;
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
#ifndef E_MOD_CONFIG_H
|
#ifndef E_MOD_CONFIG_H
|
||||||
#define E_MOD_CONFIG_H
|
#define E_MOD_CONFIG_H
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
EAPI void e_int_config_battery(E_Container *con, Battery *b);
|
EAPI void _config_battery_module(E_Container *con, Battery *b);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -145,7 +145,7 @@ e_modapi_config(E_Module *m)
|
||||||
if (!e->faces) return 0;
|
if (!e->faces) return 0;
|
||||||
face = e->faces->data;
|
face = e->faces->data;
|
||||||
if (!face) return 0;
|
if (!face) return 0;
|
||||||
e_int_config_battery(face->con, face->battery);
|
_config_battery_module(face->con, face->battery);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1582,7 +1582,7 @@ _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
face = data;
|
face = data;
|
||||||
if (!face) return;
|
if (!face) return;
|
||||||
e_int_config_battery(face->con, face->battery);
|
_config_battery_module(face->con, face->battery);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -24,7 +24,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFDa
|
||||||
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
|
|
||||||
void
|
void
|
||||||
e_int_config_clock(E_Container *con, Clock_Face *c)
|
_config_clock_module(E_Container *con, Clock_Face *c)
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
E_Config_Dialog_View v;
|
E_Config_Dialog_View v;
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
#ifndef E_MOD_CONFIG_H
|
#ifndef E_MOD_CONFIG_H
|
||||||
#define E_MOD_CONFIG_H
|
#define E_MOD_CONFIG_H
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
EAPI void e_int_config_clock(E_Container *con, Clock_Face *c);
|
EAPI void _config_clock_module(E_Container *con, Clock_Face *c);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -108,7 +108,7 @@ e_modapi_config(E_Module *m)
|
||||||
if (!e->faces) return 0;
|
if (!e->faces) return 0;
|
||||||
face = e->faces->data;
|
face = e->faces->data;
|
||||||
if (!face) return 0;
|
if (!face) return 0;
|
||||||
e_int_config_clock(face->con, face);
|
_config_clock_module(face->con, face);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -436,7 +436,7 @@ _clock_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
face = data;
|
face = data;
|
||||||
if (!face) return;
|
if (!face) return;
|
||||||
e_int_config_clock(face->con, face);
|
_config_clock_module(face->con, face);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -5,11 +5,6 @@
|
||||||
typedef struct _cfdata CFData;
|
typedef struct _cfdata CFData;
|
||||||
typedef struct _Cfg_File_Data Cfg_File_Data;
|
typedef struct _Cfg_File_Data Cfg_File_Data;
|
||||||
|
|
||||||
#define ICONSIZE_SMALL 24
|
|
||||||
#define ICONSIZE_MEDIUM 32
|
|
||||||
#define ICONSIZE_LARGE 40
|
|
||||||
#define ICONSIZE_VERYLARGE 48
|
|
||||||
|
|
||||||
struct _cfdata
|
struct _cfdata
|
||||||
{
|
{
|
||||||
int autofit;
|
int autofit;
|
||||||
|
@ -34,7 +29,8 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
|
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
|
||||||
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
|
|
||||||
void e_int_config_ibar(E_Container *con, IBar *ibar)
|
void
|
||||||
|
_config_ibar_module(E_Container *con, IBar *ibar)
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
E_Config_Dialog_View v;
|
E_Config_Dialog_View v;
|
||||||
|
@ -51,7 +47,8 @@ void e_int_config_ibar(E_Container *con, IBar *ibar)
|
||||||
cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ibar);
|
cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ibar);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _fill_data(IBar *ib, CFData *cfdata)
|
static void
|
||||||
|
_fill_data(IBar *ib, CFData *cfdata)
|
||||||
{
|
{
|
||||||
cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
|
cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
|
||||||
cfdata->follower = ib->conf->follower;
|
cfdata->follower = ib->conf->follower;
|
||||||
|
@ -60,7 +57,8 @@ static void _fill_data(IBar *ib, CFData *cfdata)
|
||||||
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
|
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *_create_data(E_Config_Dialog *cfd)
|
static void
|
||||||
|
*_create_data(E_Config_Dialog *cfd)
|
||||||
{
|
{
|
||||||
CFData *cfdata;
|
CFData *cfdata;
|
||||||
IBar *ib;
|
IBar *ib;
|
||||||
|
@ -71,12 +69,14 @@ static void *_create_data(E_Config_Dialog *cfd)
|
||||||
return cfdata;
|
return cfdata;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata)
|
static void
|
||||||
|
_free_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
{
|
{
|
||||||
free(cfdata);
|
free(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
static Evas_Object
|
||||||
|
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
||||||
{
|
{
|
||||||
Evas_Object *o, *ob;
|
Evas_Object *o, *ob;
|
||||||
IBar *ib;
|
IBar *ib;
|
||||||
|
@ -92,7 +92,8 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFDa
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
static int
|
||||||
|
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
{
|
{
|
||||||
IBar *ib;
|
IBar *ib;
|
||||||
Evas_List *l;
|
Evas_List *l;
|
||||||
|
@ -123,10 +124,10 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
static Evas_Object
|
||||||
|
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
||||||
{
|
{
|
||||||
Evas_Object *o, *of, *ob, *ot;
|
Evas_Object *o, *of, *ob;
|
||||||
E_Radio_Group *rg;
|
|
||||||
IBar *ib;
|
IBar *ib;
|
||||||
|
|
||||||
ib = cfd->data;
|
ib = cfd->data;
|
||||||
|
@ -159,7 +160,8 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, C
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
static int
|
||||||
|
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
{
|
{
|
||||||
IBar *ib;
|
IBar *ib;
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
#ifndef E_MOD_CONFIG_H
|
#ifndef E_MOD_CONFIG_H
|
||||||
#define E_MOD_CONFIG_H
|
#define E_MOD_CONFIG_H
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
EAPI void e_int_config_ibar(E_Container *con, IBar *ibar);
|
EAPI void _config_ibar_module(E_Container *con, IBar *ibar);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -170,7 +170,7 @@ e_modapi_config(E_Module *m)
|
||||||
|
|
||||||
ib = m->data;
|
ib = m->data;
|
||||||
con = e_container_current_get(e_manager_current_get());
|
con = e_container_current_get(e_manager_current_get());
|
||||||
if (ib) e_int_config_ibar(con, ib);
|
if (ib) _config_ibar_module(con, ib);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -648,7 +648,7 @@ _ibar_bar_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
ibb = data;
|
ibb = data;
|
||||||
if (!ibb) return;
|
if (!ibb) return;
|
||||||
e_int_config_ibar(ibb->con, ibb->ibar);
|
_config_ibar_module(ibb->con, ibb->ibar);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -29,7 +29,8 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
|
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
|
||||||
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
|
|
||||||
void e_int_config_ibox(E_Container *con, IBox *ibox)
|
void
|
||||||
|
_config_ibox_module(E_Container *con, IBox *ibox)
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
E_Config_Dialog_View v;
|
E_Config_Dialog_View v;
|
||||||
|
@ -46,7 +47,8 @@ void e_int_config_ibox(E_Container *con, IBox *ibox)
|
||||||
cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, &v, ibox);
|
cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, &v, ibox);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _fill_data(IBox *ib, CFData *cfdata)
|
static void
|
||||||
|
_fill_data(IBox *ib, CFData *cfdata)
|
||||||
{
|
{
|
||||||
cfdata->autofit = (ib->conf->width == IBOX_WIDTH_AUTO);
|
cfdata->autofit = (ib->conf->width == IBOX_WIDTH_AUTO);
|
||||||
cfdata->follower = ib->conf->follower;
|
cfdata->follower = ib->conf->follower;
|
||||||
|
@ -55,7 +57,8 @@ static void _fill_data(IBox *ib, CFData *cfdata)
|
||||||
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
|
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *_create_data(E_Config_Dialog *cfd)
|
static void
|
||||||
|
*_create_data(E_Config_Dialog *cfd)
|
||||||
{
|
{
|
||||||
CFData *cfdata;
|
CFData *cfdata;
|
||||||
IBox *ib;
|
IBox *ib;
|
||||||
|
@ -66,12 +69,14 @@ static void *_create_data(E_Config_Dialog *cfd)
|
||||||
return cfdata;
|
return cfdata;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _free_data(E_Config_Dialog *cfd, CFData *cfdata)
|
static void
|
||||||
|
_free_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
{
|
{
|
||||||
free(cfdata);
|
free(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
static Evas_Object
|
||||||
|
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
||||||
{
|
{
|
||||||
Evas_Object *o, *ob;
|
Evas_Object *o, *ob;
|
||||||
IBox *ib;
|
IBox *ib;
|
||||||
|
@ -87,7 +92,8 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFDa
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
static int
|
||||||
|
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
{
|
{
|
||||||
IBox *ib;
|
IBox *ib;
|
||||||
Evas_List *l;
|
Evas_List *l;
|
||||||
|
@ -118,7 +124,8 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
static Evas_Object
|
||||||
|
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
|
||||||
{
|
{
|
||||||
Evas_Object *o, *of, *ob;
|
Evas_Object *o, *of, *ob;
|
||||||
IBox *ib;
|
IBox *ib;
|
||||||
|
@ -153,7 +160,8 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, C
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
static int
|
||||||
|
_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
|
||||||
{
|
{
|
||||||
IBox *ib;
|
IBox *ib;
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
#ifndef E_MOD_CONFIG_H
|
#ifndef E_MOD_CONFIG_H
|
||||||
#define E_MOD_CONFIG_H
|
#define E_MOD_CONFIG_H
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
EAPI void e_int_config_ibox(E_Container *con, IBox *ibox);
|
EAPI void _config_ibox_module(E_Container *con, IBox *ibox);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -157,7 +157,7 @@ e_modapi_config(E_Module *m)
|
||||||
if (!e->boxes) return 0;
|
if (!e->boxes) return 0;
|
||||||
face = e->boxes->data;
|
face = e->boxes->data;
|
||||||
if (!face) return 0;
|
if (!face) return 0;
|
||||||
e_int_config_ibox(face->con, face->ibox);
|
_config_ibox_module(face->con, face->ibox);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -473,7 +473,7 @@ _ibox_box_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
ibb = (IBox_Box *)data;
|
ibb = (IBox_Box *)data;
|
||||||
if (!ibb) return;
|
if (!ibb) return;
|
||||||
e_int_config_ibox(ibb->con, ibb->ibox);
|
_config_ibox_module(ibb->con, ibb->ibox);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -29,7 +29,7 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, C
|
||||||
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
|
|
||||||
void
|
void
|
||||||
e_int_config_pager(E_Container *con, Pager *pager)
|
_config_pager_module(E_Container *con, Pager *pager)
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
E_Config_Dialog_View v;
|
E_Config_Dialog_View v;
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
#ifndef E_MOD_CONFIG_H
|
#ifndef E_MOD_CONFIG_H
|
||||||
#define E_MOD_CONFIG_H
|
#define E_MOD_CONFIG_H
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
EAPI void e_int_config_pager(E_Container *con, Pager *pager);
|
EAPI void _config_pager_module(E_Container *con, Pager *pager);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -166,7 +166,7 @@ e_modapi_config(E_Module *m)
|
||||||
if (!e->faces) return 0;
|
if (!e->faces) return 0;
|
||||||
face = e->faces->data;
|
face = e->faces->data;
|
||||||
if (!face) return 0;
|
if (!face) return 0;
|
||||||
e_int_config_pager(e_container_current_get(e_manager_current_get()), e);
|
_config_pager_module(e_container_current_get(e_manager_current_get()), e);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2141,7 +2141,7 @@ _pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
p = data;
|
p = data;
|
||||||
if (!p) return;
|
if (!p) return;
|
||||||
e_int_config_pager(e_container_current_get(e_manager_current_get()), p);
|
_config_pager_module(e_container_current_get(e_manager_current_get()), p);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -37,7 +37,7 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
|
||||||
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
|
||||||
|
|
||||||
void
|
void
|
||||||
e_int_config_temperature(E_Container *con, Temperature *temp)
|
_config_temperature_module(E_Container *con, Temperature *temp)
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
E_Config_Dialog_View v;
|
E_Config_Dialog_View v;
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
#ifndef E_MOD_CONFIG_H
|
#ifndef E_MOD_CONFIG_H
|
||||||
#define E_MOD_CONFIG_H
|
#define E_MOD_CONFIG_H
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
EAPI void e_int_config_temperature(E_Container *con, Temperature *temp);
|
EAPI void _config_temperature_module(E_Container *con, Temperature *temp);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -112,7 +112,7 @@ e_modapi_config(E_Module *m)
|
||||||
if (!e->faces) return 0;
|
if (!e->faces) return 0;
|
||||||
face = e->faces->data;
|
face = e->faces->data;
|
||||||
if (!face) return 0;
|
if (!face) return 0;
|
||||||
e_int_config_temperature(face->con, face->temp);
|
_config_temperature_module(face->con, face->temp);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -627,7 +627,7 @@ _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
tf = data;
|
tf = data;
|
||||||
if (!tf) return;
|
if (!tf) return;
|
||||||
e_int_config_temperature(tf->con, tf->temp);
|
_config_temperature_module(tf->con, tf->temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue