forked from enlightenment/enlightenment
step 5: migrate battery module with properly #ifdef-ed code
SVN revision: 48496
This commit is contained in:
parent
e8a43d4c1e
commit
5593cdfe91
|
@ -9,7 +9,7 @@ struct _E_Config_Dialog_Data
|
|||
int alert_percent;
|
||||
int dismiss_alert;
|
||||
int alert_timeout;
|
||||
int force_mode; // 0 == auto, 1 == batget, 2 == hal
|
||||
int force_mode; // 0 == auto, 1 == batget, 2 == dbus
|
||||
struct
|
||||
{
|
||||
Evas_Object *show_alert_label;
|
||||
|
@ -229,7 +229,11 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
|
|||
e_widget_list_object_append(o, ob, 1, 0, 0.0);
|
||||
ob = e_widget_radio_add(evas, _("Internal"), 1, rg);
|
||||
e_widget_list_object_append(o, ob, 1, 0, 0.0);
|
||||
#ifdef HAVE_EUKIT
|
||||
ob = e_widget_radio_add(evas, _("UPower"), 2, rg);
|
||||
#else
|
||||
ob = e_widget_radio_add(evas, _("HAL"), 2, rg);
|
||||
#endif
|
||||
e_widget_list_object_append(o, ob, 1, 0, 0.0);
|
||||
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Hardware"), o, 1, 0, 1, 0,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -29,19 +29,26 @@ struct _Config
|
|||
Ecore_Event_Handler *batget_data_handler;
|
||||
Ecore_Event_Handler *batget_del_handler;
|
||||
Ecore_Timer *alert_timer;
|
||||
int have_hal;
|
||||
int have_dbus;
|
||||
#ifdef HAVE_EUKIT
|
||||
double full;
|
||||
int64_t time_left;
|
||||
int64_t time_full;
|
||||
#else
|
||||
int full;
|
||||
int time_left;
|
||||
int time_full;
|
||||
#endif
|
||||
int have_battery;
|
||||
int have_power;
|
||||
struct {
|
||||
// FIXME: on bat_conf del dbus_pending_call_cancel(hal.have);
|
||||
// then set hal.have to NULL
|
||||
// FIXME: on bat_conf del dbus_pending_call_cancel(dbus.have);
|
||||
// then set dbus.have to NULL
|
||||
DBusPendingCall *have;
|
||||
// FIXME: on bat_conf del e_dbus_signal_handler_del() these
|
||||
E_DBus_Signal_Handler *dev_add;
|
||||
E_DBus_Signal_Handler *dev_del;
|
||||
} hal;
|
||||
} dbus;
|
||||
};
|
||||
|
||||
EAPI extern E_Module_Api e_modapi;
|
||||
|
|
Loading…
Reference in New Issue