diff -Nru kmobiletools-0.5.0-beta3/kmobiletools/configure.in.in kmobiletools-0.5.0-beta3-shl/kmobiletools/configure.in.in --- kmobiletools-0.5.0-beta3/kmobiletools/configure.in.in 2007-06-05 16:18:07.000000000 +0200 +++ kmobiletools-0.5.0-beta3-shl/kmobiletools/configure.in.in 2007-06-16 19:59:20.000000000 +0200 @@ -8,7 +8,7 @@ # BEGIN KONTACT CHECK ############################################################################### -AC_ARG_ENABLE(kontact, AC_HELP_STRING([--disable-kontact-plugin], [disable KMobileTools Kontact plugin (default: check)]), +AC_ARG_ENABLE(kontact, AC_HELP_STRING([--disable-kontact], [disable KMobileTools Kontact plugin (default: check)]), [enable_kontact=$enableval], [enable_kontact=yes]) if test "$enable_kontact" = "yes"; then KDE_CHECK_HEADER(kontact/plugin.h, [have_kontact="yes"], [have_kontact="no"]) @@ -72,18 +72,22 @@ #AC_SUBST(LIB_GAMMU) #AM_CONDITIONAL(with_gammu, test $have_gammu = yes) -AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [enable KIOSlaves for filesystem access (default: disable)]), +AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [disable all KIOSlaves for filesystem access (default: enable)]), [enable_kioslaves=$enableval], [enable_kioslaves=yes]) -if test "x$enable_kioslaves" = "xyes"; then - KDE_CHECK_HEADER(p2kmoto.h, have_p2k=yes, have_p2k=no) - AM_CONDITIONAL(with_p2kmoto, test $have_p2k = yes) - KDE_CHECK_HEADER(obexftp/client.h, have_obexftp=yes, have_obexftp=no) - AM_CONDITIONAL(compile_obex, test $have_obexftp = yes) -else - AM_CONDITIONAL(with_p2kmoto, false) - AM_CONDITIONAL(compile_obex, false) +AC_ARG_ENABLE(p2kmoto, AC_HELP_STRING([--disable-p2kmoto], [disable p2kmoto kioslave (default: check)]), + [enable_p2kmoto=$enableval], [enable_p2kmoto=yes]) +if test "x$enable_p2kmoto" = "xyes" && test "x$enable_kioslaves" = "xyes"; then + KDE_CHECK_HEADER(p2kmoto.h, have_p2k=yes, have_p2k=no) +fi +AM_CONDITIONAL(with_p2kmoto, test "x$have_p2k" = "xyes") + +AC_ARG_ENABLE(obexftp, AC_HELP_STRING([--disable-obexftp], [disable obex kioslave (default: check)]), + [enable_obexftp=$enableval], [enable_obexftp=yes]) +if test "x$enable_obexftp" = "xyes" && test "x$enable_kioslaves" = "xyes"; then + KDE_CHECK_HEADER(obexftp/client.h, have_obexftp=yes, have_obexftp=no) fi +AM_CONDITIONAL(compile_obex, test "x$have_obexftp" = "xyes") if test "x$have_p2k" = "xyes"; then AC_DEFINE(HAVE_P2KLIB, 1, [p2k filesystem support]) @@ -117,9 +121,14 @@ [enable_tests=$enableval], [enable_tests=no]) AM_CONDITIONAL(compile_tests, test x$enable_tests = xyes) -KDE_CHECK_HEADER(kdebluetooth/rfcommsocketdevice.h, have_kbluetooth=yes, have_kbluetooth=no) -AM_CONDITIONAL(with_kdebluetooth, test $have_kbluetooth = yes) -if test "$have_kbluetooth" = "yes"; then +AC_ARG_ENABLE(kdebluetooth, AC_HELP_STRING([--disable-kdebluetooth], [disable kdebluetooth integration (default: check)]), + [enable_kdebluetooth=$enableval], [enable_kdebluetooth=yes]) +if test "x$enable_kdebluetooth" = "xyes"; then + KDE_CHECK_HEADER(kdebluetooth/rfcommsocketdevice.h, have_kbluetooth=yes, have_kbluetooth=no) +fi + +AM_CONDITIONAL(with_kdebluetooth, test "x$have_kbluetooth" = "xyes") +if test "x$have_kbluetooth" = "xyes"; then AC_DEFINE(KBLUETOOTH, 1, [use kdebluetooth rfcomm socket]) AC_SUBST(KBLUETOOTH) LIB_KBLUETOOTH="-lkbluetooth" @@ -135,9 +144,12 @@ CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS $all_includes -DDBUS_API_SUBJECT_TO_CHANGE" -KDE_CHECK_HEADER(libkbluetooth/adapter.h, have_new_kbluetooth=yes, have_new_kbluetooth=no) -AM_CONDITIONAL(with_kdebluetooth_new, test x$have_new_kbluetooth = xyes) -if test "$have_new_kbluetooth" = "yes"; then +if test "x$enable_kdebluetooth" = "xyes"; then + KDE_CHECK_HEADER(libkbluetooth/adapter.h, have_new_kbluetooth=yes, have_new_kbluetooth=no) +fi + +AM_CONDITIONAL(with_kdebluetooth_new, test "x$have_new_kbluetooth" = "xyes") +if test "x$have_new_kbluetooth" = "xyes"; then PKG_CHECK_MODULES(BLUEZ, "bluez") AC_DEFINE(KBLUETOOTH_NEW, 1, [use new kdebluetooth]) AC_SUBST(KBLUETOOTH_NEW) diff -Nru kmobiletools-0.5.0-beta3/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp kmobiletools-0.5.0-beta3-shl/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp --- kmobiletools-0.5.0-beta3/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp 2007-06-05 16:18:07.000000000 +0200 +++ kmobiletools-0.5.0-beta3-shl/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp 2007-06-14 17:18:55.000000000 +0200 @@ -572,7 +572,7 @@ GSM_CallShowNumber showNumber = GSM_CALL_DefaultNumberPresence; m_mutex.lock(); - m_error = m_phoneFunctions->DialVoice( &m_stateMachine, (char*) number.data(), + m_error = m_phoneFunctions->DialVoice( &m_stateMachine, (number.utf8().data() ), showNumber ); if( m_error != ERR_NONE ) { printErrorMessage( m_error, "dial" );