summaryrefslogtreecommitdiffstats
path: root/tdeioslave
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-18 18:35:56 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-18 18:35:56 -0500
commit891da4b83e901780ca4becb9b6f7c9cf0fb70ffd (patch)
treeb177b8ddddf3a0e73a86e482d88e0e188c601516 /tdeioslave
parent0c11ace605ba33feb137eca638a39c27a71e1d8d (diff)
parentd7ccc16037550f5dc9ba2db00e47ea950c3732d2 (diff)
downloadtdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.zip
tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.tar.gz
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'tdeioslave')
-rw-r--r--tdeioslave/ConfigureChecks.cmake6
-rw-r--r--tdeioslave/man/man2html.cpp12
-rw-r--r--tdeioslave/media/mediamanager/CMakeLists.txt37
-rw-r--r--tdeioslave/media/medianotifier/medianotifier.cpp6
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp4
-rw-r--r--tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp3
7 files changed, 42 insertions, 28 deletions
diff --git a/tdeioslave/ConfigureChecks.cmake b/tdeioslave/ConfigureChecks.cmake
index 8f07831..eed3708 100644
--- a/tdeioslave/ConfigureChecks.cmake
+++ b/tdeioslave/ConfigureChecks.cmake
@@ -11,6 +11,12 @@
if( WITH_SASL )
check_include_file( "sasl/sasl.h" HAVE_SASL_SASL_H )
+ if( NOT HAVE_SASL_SASL_H )
+ find_path( SASL_H_PATH "sasl/sasl.h" )
+ if( SASL_H_PATH )
+ set( HAVE_SASL_SASL_H "1" )
+ endif( )
+ endif( )
check_library_exists( sasl2 sasl_client_init "" HAVE_LIBSASL2 )
if( HAVE_SASL_SASL_H AND HAVE_LIBSASL2 )
set( SASL_LIBRARIES sasl2 )
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index 67354e1..eee3ac8 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -2707,6 +2707,7 @@ static const char *section_list[] = {
"3L", "Lightweight Processes Library",
"3M", "Mathematical Library",
"3N", "Network Functions",
+ "3p", "Perl Functions",
"3R", "RPC Services Library",
"3S", "Standard I/O Functions",
"3V", "C Library Functions",
@@ -5482,16 +5483,17 @@ static char *scan_troff_mandoc(char *c, bool san, char **result)
end++;
}
- if (end > c + 2
+ if (end >= c + 2
&& ispunct(*(end - 1))
&& isspace(*(end - 2)) && *(end - 2) != '\n') {
/* Don't format lonely punctuation E.g. in "xyz ," format
* the xyz and then append the comma removing the space.
*/
- *(end - 2) = '\n';
- ret = scan_troff(c, san, result);
- *(end - 2) = *(end - 1);
- *(end - 1) = ' ';
+ *(end - 2) = 0;
+ (void)scan_troff(c, 0, result);
+ ret = end-2;
+ *(end-2)=*(end-1);
+ *(end-1)=' ';
}
else {
ret = scan_troff(c, san, result);
diff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt
index 5a73f37..21faaea 100644
--- a/tdeioslave/media/mediamanager/CMakeLists.txt
+++ b/tdeioslave/media/mediamanager/CMakeLists.txt
@@ -36,30 +36,21 @@ install( FILES mediamanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
set( target kded_mediamanager )
if( WITH_HAL )
- set( ${target}_SRCS
- mediamanager.cpp mediamanager.skel medialist.cpp
- backendbase.cpp fstabbackend.cpp removablebackend.cpp
- mediadirnotify.cpp mediadirnotify.skel
- decryptdialog.ui dialog.cpp
- halbackend.cpp linuxcdpolling.cpp tdehardwarebackend.cpp
- )
+ set( HAL_MEDIA_BACKEND halbackend.cpp linuxcdpolling.cpp )
+ set( HAL_MEDIA_LIBRARIES ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} )
+endif( )
- tde_add_kpart( ${target} AUTOMOC
- SOURCES ${${target}_SRCS}
- LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
- DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-else( )
- set( ${target}_SRCS
+if( WITH_TDEHWLIB )
+ set( TDEHWBACKEND tdehardwarebackend.cpp )
+endif( WITH_TDEHWLIB )
+
+tde_add_kpart( ${target} AUTOMOC
+ SOURCES
mediamanager.cpp mediamanager.skel medialist.cpp
backendbase.cpp fstabbackend.cpp removablebackend.cpp
decryptdialog.ui dialog.cpp
- mediadirnotify.cpp mediadirnotify.skel tdehardwarebackend.cpp
- )
-
- tde_add_kpart( ${target} AUTOMOC
- SOURCES ${${target}_SRCS}
- LINK mediacommon-static tdeinit_kded-shared
- DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-endif( )
+ mediadirnotify.cpp mediadirnotify.skel
+ ${HAL_MEDIA_BACKEND} ${TDEHWBACKEND}
+ LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES}
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 2db917b..4de36ca 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -19,7 +19,13 @@
#include "medianotifier.h"
+#ifdef __OpenBSD__
+#include <sys/statvfs.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+#else
#include <sys/vfs.h>
+#endif
#include <tqfile.h>
#include <tqfileinfo.h>
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index c9a920f..7e4004e 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -28,7 +28,9 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
+#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
+#endif
#include "actionlistboxitem.h"
#include "notificationdialogview.h"
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 5357bc6..3f0319f 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -33,7 +33,9 @@
#include <kprocess.h>
#include <tdestartupinfo.h>
#include <kmimetype.h>
+#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
+#endif
#include "dialog.h"
#include "tdeio_media_mounthelper.h"
@@ -187,6 +189,7 @@ MountHelper::MountHelper() : TDEApplication()
void MountHelper::invokeEject(const TQString &device, bool quiet)
{
+#ifdef __TDE_HAVE_TDEHWLIB
// Try TDE HW library eject first...
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
@@ -197,6 +200,7 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
::exit(0);
}
}
+#endif
// Then fall back to tdeeject if needed
TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index dc46e82..61c5ccb 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -33,6 +33,9 @@
#ifdef HAVE_STATVFS
# include <sys/statvfs.h>
#else
+# ifdef __OpenBSD__
+# include <sys/param.h>
+# endif
# include <sys/mount.h>
# define statvfs statfs
# define f_frsize f_bsize