• spiiroin's avatar
    [usb-moded] Use MEEGOLOCK features only when enabled. Fixes MER#1765 · 04e3a753
    spiiroin authored
    The is_in_user_state() is used unconditionally, but it is available only
    when --enable-meegodevlock option has been passed to configure. Also,
    the related "usb_moded-dsme.h" is included both unconditionally and from
    withing a #ifdef MEEGOLOCK block - which hides the configuration problem
    until build proceeds to linking phase.
    
    Make the call is_in_user_state() only if MEEGOLOCK is defined.
    
    Remove the extraneous "usb_moded-dsme.h" include to make such errors
    visible already in compilation stage due to missing prototypes.
    
    Also, make sure the "usb_moded-dsme.h" can't be included without
    warnings unless MEEGOLOCK is defined.
    Signed-off-by: spiiroin's avatarSimo Piiroinen <simo.piiroinen@jollamobile.com>
    04e3a753
Name
Last commit
Last update
..
Makefile.am Loading commit data...
com.meego.usb_moded.xml Loading commit data...
usb_moded-android.c Loading commit data...
usb_moded-android.h Loading commit data...
usb_moded-appsync-dbus-private.h Loading commit data...
usb_moded-appsync-dbus.c Loading commit data...
usb_moded-appsync-dbus.h Loading commit data...
usb_moded-appsync.c Loading commit data...
usb_moded-appsync.h Loading commit data...
usb_moded-config-private.h Loading commit data...
usb_moded-config.c Loading commit data...
usb_moded-config.h Loading commit data...
usb_moded-dbus-private.h Loading commit data...
usb_moded-dbus.c Loading commit data...
usb_moded-dbus.h Loading commit data...
usb_moded-devicelock.c Loading commit data...
usb_moded-devicelock.h Loading commit data...
usb_moded-dsme.c Loading commit data...
usb_moded-dsme.h Loading commit data...
usb_moded-dyn-config.c Loading commit data...
usb_moded-dyn-config.h Loading commit data...
usb_moded-hw-ab.h Loading commit data...
usb_moded-lock.h Loading commit data...
usb_moded-log.c Loading commit data...
usb_moded-log.h Loading commit data...
usb_moded-mac.c Loading commit data...
usb_moded-mac.h Loading commit data...
usb_moded-modes.h Loading commit data...
usb_moded-modesetting.c Loading commit data...
usb_moded-modesetting.h Loading commit data...
usb_moded-modules-android.c Loading commit data...
usb_moded-modules.c Loading commit data...
usb_moded-modules.h Loading commit data...
usb_moded-network.c Loading commit data...
usb_moded-network.h Loading commit data...
usb_moded-ssu.c Loading commit data...
usb_moded-ssu.h Loading commit data...
usb_moded-systemd.c Loading commit data...
usb_moded-systemd.h Loading commit data...
usb_moded-trigger.c Loading commit data...
usb_moded-trigger.h Loading commit data...
usb_moded-udev.c Loading commit data...
usb_moded-util.c Loading commit data...
usb_moded.c Loading commit data...
usb_moded.h Loading commit data...