diff options
| author |  Fabio Bas | 2011-03-29 13:07:06 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-03-29 13:07:06 +0000 |
| commit | db7edf5232ddcaa01c57fa25710a037fff001eb5 (patch) | |
| tree | 7076e91b2dedc60a24919d7d59312f37e04898e9 | |
| parent | patch for #1124 (diff) | |
| download | KVIrc-db7edf5232ddcaa01c57fa25710a037fff001eb5.tar.gz KVIrc-db7edf5232ddcaa01c57fa25710a037fff001eb5.tar.bz2 KVIrc-db7edf5232ddcaa01c57fa25710a037fff001eb5.zip | |
fix for #1123
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5727 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/modules/options/OptionsWidget_notifier.cpp | 2 | ||||
| -rw-r--r-- | src/modules/system/libkvisystem.cpp | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp index 76ec28f4b..ecddebb70 100644 --- a/src/modules/options/OptionsWidget_notifier.cpp +++ b/src/modules/options/OptionsWidget_notifier.cpp @@ -263,11 +263,13 @@ OptionsWidget_notifier::~OptionsWidget_notifier() #ifdef COMPILE_KDE_SUPPORT void OptionsWidget_notifier::toggleNotifierProtocol(bool) { +#ifdef COMPILE_DBUS_SUPPORT if(m_pKdeNotifier->isEnabled()) m_pDBusNotifier->setEnabled(!m_pKdeNotifier->isChecked()); if(m_pDBusNotifier->isEnabled()) m_pKdeNotifier->setEnabled(!m_pDBusNotifier->isChecked()); +#endif } #endif // COMPILE_KDE_SUPPORT diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 9958c1a9f..d724e7722 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -44,8 +44,11 @@ #include <unistd.h> #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_DBUS_SUPPORT #include <QtDBus/QtDBus> +#endif + +#ifdef COMPILE_KDE_SUPPORT #include <KToolInvocation> // invokeTerminal() for system.runcmd #else // tools we need to work around the absence of // invokeTerminal() @@ -416,8 +419,8 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) <variant> $system.dbus(<service:string>,<path:string>,<interface:string>,<method:string>[,<bus_type:string>[,<parameter1:string>[,<parameter2:string>[,...]]]]) @description: This function allows performing simple Dbus calls without executing - an external process. This feature is available ONLY when KDE support - is compiled in the executable: this means that this function is absolutely + an external process. This feature is available ONLY under unix: + this means that this function is absolutely non portable (don't use it in scripts that you're going to distribute). <application> is the name of the application being called, <objectid> is the identifier of the object called, <function> is the function to be executed @@ -465,7 +468,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) KVSM_PARAMETER("parameter_list",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,parms) KVSM_PARAMETERS_END(c) -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_DBUS_SUPPORT if(szBusType.isEmpty()) szBusType = "session"; @@ -611,7 +614,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) } #else - c->warning(__tr2qs("DBus calls are available only when KDE support is compiled in")); + c->warning(__tr2qs("DBus calls are available only under unix")); #endif return true; } |