From f4477991e23838c49eb59f94230ce5ac3858dffa Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 8 Oct 2008 00:38:45 +0200 Subject: [PATCH] Fix checking for existing driver and callbacks --- src/element.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/element.c b/src/element.c index d2fe4bc..5b2ecbc 100644 --- a/src/element.c +++ b/src/element.c @@ -356,13 +356,10 @@ static DBusMessage *do_update(DBusConnection *conn, DBG("conn %p", conn); - if (element->driver == NULL) - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); - if (element->enabled == FALSE) return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); - if (element->driver->update) { + if (element->driver && element->driver->update) { DBG("Calling update callback"); element->driver->update(element); } @@ -377,13 +374,10 @@ static DBusMessage *do_enable(DBusConnection *conn, DBG("conn %p", conn); - if (element->driver == NULL) - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); - if (element->enabled == TRUE) return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); - if (element->driver->enable) { + if (element->driver && element->driver->enable) { DBG("Calling enable callback"); element->driver->enable(element); } -- 2.7.4