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

e17: bluez: ecrustify 

SVN revision: 57941
This commit is contained in:
Lucas De Marchi 2011-03-21 20:31:42 +00:00
parent 8cf21c272f
commit 31f92ef736
3 changed files with 373 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/modules/bluez/e_mod_config.c
View File

@ -5,10 +5,11 @@ extern const char _e_bluez_Name[];
struct _E_Config_Dialog_Data
{
E_Bluez_Instance *inst;
const char *name;
Eina_Bool mode;
unsigned int timeout;
struct {
const char *name;
Eina_Bool mode;
unsigned int timeout;
struct
{
Evas_Object *label;
Evas_Object *slider;
Evas_Object *help;
@ -16,13 +17,18 @@ struct _E_Config_Dialog_Data
};
/* Local Function Prototypes */
static void *_create_data(E_Config_Dialog *dialog);
static void _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata);
static void *_create_data(E_Config_Dialog *dialog);
static void _free_data(E_Config_Dialog *dialog,
E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *dialog,
Evas *evas,
E_Config_Dialog_Data *cfdata);
static int _basic_apply(E_Config_Dialog *dialog,
E_Config_Dialog_Data *cfdata);
E_Config_Dialog *
e_bluez_config_dialog_new(E_Container *con, E_Bluez_Instance *inst)
e_bluez_config_dialog_new(E_Container *con,
E_Bluez_Instance *inst)
{
E_Config_Dialog *dialog;
E_Config_Dialog_View *view;
@ -62,7 +68,7 @@ _create_data(E_Config_Dialog *dialog)
cfdata->mode = 0;
if (!e_bluez_adapter_discoverable_timeout_get
(inst->adapter, &cfdata->timeout))
(inst->adapter, &cfdata->timeout))
cfdata->timeout = 0;
cfdata->timeout /= 60;
@ -74,7 +80,8 @@ _create_data(E_Config_Dialog *dialog)
}
static void
_free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
_free_data(E_Config_Dialog *dialog,
E_Config_Dialog_Data *cfdata)
{
E_Bluez_Instance *inst = dialog->data;
@ -83,7 +90,8 @@ _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
}
static void
_cb_disable_timeout(void *data, Evas_Object *obj __UNUSED__)
_cb_disable_timeout(void *data,
Evas_Object *obj __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
Eina_Bool disable = !cfdata->mode;
@ -94,7 +102,9 @@ _cb_disable_timeout(void *data, Evas_Object *obj __UNUSED__)
}
static Evas_Object *
_basic_create(E_Config_Dialog *dialog __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
_basic_create(E_Config_Dialog *dialog __UNUSED__,
Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob;
Evas_Object *check;
@ -113,7 +123,7 @@ _basic_create(E_Config_Dialog *dialog __UNUSED__, Evas *evas, E_Config_Dialog_Da
e_widget_list_object_append(o, ob, 1, 1, 0.5);
check = e_widget_check_add
(evas, _("Discoverable mode"), (int *)&cfdata->mode);
(evas, _("Discoverable mode"), (int *)&cfdata->mode);
e_widget_list_object_append(o, check, 1, 1, 0.5);
ob = e_widget_label_add(evas, _("Discovarable Timeout"));
@ -121,7 +131,7 @@ _basic_create(E_Config_Dialog *dialog __UNUSED__, Evas *evas, E_Config_Dialog_Da
e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 0, 30, 1, 0,
NULL, (int*)&cfdata->timeout, 100);
NULL, (int *)&cfdata->timeout, 100);
e_widget_slider_special_value_add(ob, 0.0, 0.0, _("Forever"));
cfdata->gui.slider = ob;
e_widget_list_object_append(o, ob, 1, 1, 0.5);
@ -137,7 +147,9 @@ _basic_create(E_Config_Dialog *dialog __UNUSED__, Evas *evas, E_Config_Dialog_Da
}
static void
_method_success_check(void *data, DBusMessage *msg __UNUSED__, DBusError *error)
_method_success_check(void *data,
DBusMessage *msg __UNUSED__,
DBusError *error)
{
const char *name = data;
@ -150,24 +162,26 @@ _method_success_check(void *data, DBusMessage *msg __UNUSED__, DBusError *error)
}
static int
_basic_apply(E_Config_Dialog *dialog __UNUSED__, E_Config_Dialog_Data *cfdata)
_basic_apply(E_Config_Dialog *dialog __UNUSED__,
E_Config_Dialog_Data *cfdata)
{
E_Bluez_Instance *inst = cfdata->inst;
if (!e_bluez_adapter_discoverable_set
(inst->adapter, cfdata->mode,
_method_success_check, "e_bluez_adapter_discoverable_get"))
(inst->adapter, cfdata->mode,
_method_success_check, "e_bluez_adapter_discoverable_get"))
ERR("Can't set Discoverable on adapter");
if (!e_bluez_adapter_discoverable_timeout_set
(inst->adapter, cfdata->timeout * 60,
_method_success_check, "e_bluez_adapter_discoverable_timeout_get"))
(inst->adapter, cfdata->timeout * 60,
_method_success_check, "e_bluez_adapter_discoverable_timeout_get"))
ERR("Can't set DiscoverableTimeout on adapter");
if (!e_bluez_adapter_name_set
(inst->adapter, cfdata->name,
_method_success_check, "e_bluez_adapter_name_get"))
(inst->adapter, cfdata->name,
_method_success_check, "e_bluez_adapter_name_get"))
ERR("Can't set Name on adapter");
return 1;
}

535
src/modules/bluez/e_mod_main.c
View File

File diff suppressed because it is too large Load Diff

80
src/modules/bluez/e_mod_main.h
View File

@ -13,29 +13,29 @@ extern int _e_bluez_log_dom;
#define WRN(...) EINA_LOG_DOM_WARN(_e_bluez_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_e_bluez_log_dom, __VA_ARGS__)
typedef struct E_Bluez_Instance E_Bluez_Instance;
typedef struct E_Bluez_Instance E_Bluez_Instance;
typedef struct E_Bluez_Instance_Device E_Bluez_Instance_Device;
typedef struct E_Bluez_Module_Context E_Bluez_Module_Context;
typedef struct E_Bluez_Module_Context E_Bluez_Module_Context;
struct E_Bluez_Instance
{
E_Bluez_Module_Context *ctxt;
E_Gadcon_Client *gcc;
E_Gadcon_Popup *popup;
E_Menu *menu;
E_Gadcon_Client *gcc;
E_Gadcon_Popup *popup;
E_Menu *menu;
/* used by popup */
int powered;
Eina_Bool first_selection;
const char *address;
const char *alias;
int powered;
Eina_Bool first_selection;
const char *address;
const char *alias;
Eina_List *devices;
E_Bluez_Element *adapter;
double last_scan;
Eina_Bool discovering:1;
Eina_Bool powered_pending:1;
Eina_Bool discoverable:1;
Eina_List *devices;
E_Bluez_Element *adapter;
double last_scan;
Eina_Bool discovering : 1;
Eina_Bool powered_pending : 1;
Eina_Bool discoverable : 1;
struct
{
@ -46,14 +46,14 @@ struct E_Bluez_Instance
Evas_Object *control;
struct
{
Ecore_X_Window win;
Ecore_X_Window win;
Ecore_Event_Handler *mouse_up;
Ecore_Event_Handler *key_down;
} input;
} ui;
E_Gadcon_Popup *tip;
Evas_Object *o_tip;
E_Gadcon_Popup *tip;
Evas_Object *o_tip;
E_Config_Dialog *conf_dialog;
};
@ -70,14 +70,15 @@ struct E_Bluez_Instance_Device
struct E_Bluez_Module_Context
{
Eina_List *instances;
Eina_List *instances;
const char *default_adapter;
struct {
struct
{
E_DBus_Connection *conn;
E_DBus_Interface *iface;
E_DBus_Object *obj;
Eina_List *pending;
E_DBus_Interface *iface;
E_DBus_Object *obj;
Eina_List *pending;
} agent;
struct
@ -98,21 +99,22 @@ struct E_Bluez_Module_Context
Ecore_Poller *manager_changed;
} poller;
Eina_Bool has_manager:1;
Eina_Bool has_manager : 1;
};
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init (E_Module *m);
EAPI int e_modapi_shutdown (E_Module *m);
EAPI int e_modapi_save (E_Module *m);
const char *e_bluez_theme_path(void);
E_Config_Dialog *e_bluez_config_dialog_new(E_Container *con, E_Bluez_Instance *inst);
void _bluez_toggle_powered(E_Bluez_Instance *inst);
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
const char *e_bluez_theme_path(void);
E_Config_Dialog *e_bluez_config_dialog_new(E_Container *con,
E_Bluez_Instance *inst);
void _bluez_toggle_powered(E_Bluez_Instance *inst);
static inline void
_bluez_dbus_error_show(const char *msg, const DBusError *error)
_bluez_dbus_error_show(const char *msg,
const DBusError *error)
{
const char *name;
@ -121,22 +123,22 @@ _bluez_dbus_error_show(const char *msg, const DBusError *error)
name = error->name;
if (strncmp(name, "org.bluez.Error.",
sizeof("org.bluez.Error.") - 1) == 0)
sizeof("org.bluez.Error.") - 1) == 0)
name += sizeof("org.bluez.Error.") - 1;
e_util_dialog_show(_("Bluez Server Operation Failed"),
_("Could not execute remote operation:<br>"
"%s<br>"
"Server Error <hilight>%s:</hilight> %s"),
msg, name, error->message);
_("Could not execute remote operation:<br>"
"%s<br>"
"Server Error <hilight>%s:</hilight> %s"),
msg, name, error->message);
}
static inline void
_bluez_operation_error_show(const char *msg)
{
e_util_dialog_show(_("Bluez Operation Failed"),
_("Could not execute local operation:<br>%s"),
msg);
_("Could not execute local operation:<br>%s"),
msg);
}
#endif