well that was dumb of me

SVN revision: 49183
This commit is contained in:
Mike Blumenkrantz 2010-05-24 17:23:03 +00:00
parent 531d6e6516
commit fb5409a64a
2 changed files with 8 additions and 6 deletions

View File

@ -68,7 +68,7 @@ _battery_udev_event_battery(const char *syspath, int event, void *data, Eeze_Ude
if (((event & EEZE_UDEV_EVENT_ADD) == EEZE_UDEV_EVENT_ADD) ||
((event & EEZE_UDEV_EVENT_ONLINE) == EEZE_UDEV_EVENT_ONLINE))
_battery_udev_battery_add(syspath);
if (((event & EEZE_UDEV_EVENT_REMOVE) == EEZE_UDEV_EVENT_REMOVE) ||
else if (((event & EEZE_UDEV_EVENT_REMOVE) == EEZE_UDEV_EVENT_REMOVE) ||
((event & EEZE_UDEV_EVENT_OFFLINE) == EEZE_UDEV_EVENT_OFFLINE))
_battery_udev_battery_del(syspath);
else /* must be change */
@ -81,7 +81,7 @@ _battery_udev_event_ac(const char *syspath, int event, void *data, Eeze_Udev_Wat
if (((event & EEZE_UDEV_EVENT_ADD) == EEZE_UDEV_EVENT_ADD) ||
((event & EEZE_UDEV_EVENT_ONLINE) == EEZE_UDEV_EVENT_ONLINE))
_battery_udev_ac_add(syspath);
if (((event & EEZE_UDEV_EVENT_REMOVE) == EEZE_UDEV_EVENT_REMOVE) ||
else if (((event & EEZE_UDEV_EVENT_REMOVE) == EEZE_UDEV_EVENT_REMOVE) ||
((event & EEZE_UDEV_EVENT_OFFLINE) == EEZE_UDEV_EVENT_OFFLINE))
_battery_udev_ac_del(syspath);
else /* must be change */

View File

@ -8,7 +8,7 @@ static void _e_mod_kbd_device_kbd_add(const char *udi);
static void _e_mod_kbd_device_kbd_del(const char *udi);
static void _e_mod_kbd_device_kbd_eval(void);
#ifdef HAVE_EEZE
static void _e_mod_kbd_device_udev_event(const char *device, const char *event, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__);
static void _e_mod_kbd_device_udev_event(const char *device, int event, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__);
#else
static void _e_mod_kbd_device_cb_input_kbd(void *data __UNUSED__, void *reply, DBusError *err);
static void _e_mod_kbd_device_cb_input_kbd_is(void *data, void *reply, DBusError *err);
@ -144,13 +144,15 @@ _e_mod_kbd_device_ignore_load_file(const char *file)
#ifdef HAVE_EEZE
static void
_e_mod_kbd_device_udev_event(const char *device, const char *event, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__)
_e_mod_kbd_device_udev_event(const char *device, int event, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__)
{
if ((!device) || (!event)) return;
if ((!strcmp(event, "add")) || (!strcmp(event, "online")))
if (((event & EEZE_UDEV_EVENT_ADD) == EEZE_UDEV_EVENT_ADD) ||
((event & EEZE_UDEV_EVENT_ONLINE) == EEZE_UDEV_EVENT_ONLINE))
_e_mod_kbd_device_kbd_add(device);
else if ((!strcmp(event, "remove")) || (!strcmp(event, "offline")))
else if (((event & EEZE_UDEV_EVENT_REMOVE) == EEZE_UDEV_EVENT_REMOVE) ||
((event & EEZE_UDEV_EVENT_OFFLINE) == EEZE_UDEV_EVENT_OFFLINE))
_e_mod_kbd_device_kbd_del(device);
_e_mod_kbd_device_kbd_eval();