tde-devels

devels@trinitydesktop.org

4 participants
3753 discussions

[PATCH] kopete_plugin_nowlistening_plain.diff

by Slávek Banko

Hi. I have tiny patch, that fix problem with html special chars (especially &) in messages from nowlistening plugin in kopete. Kopete::Message::RichText expects already escaped chars, but messages from nowlistening is plain text. With Kopete::Message::PlainText is message valid. Slavek

13 years, 6 months

[PATCH] kopete_jabber_pongserver.diff

by Slávek Banko

Hi. I have small patch, that add xep-0199 respond to kopete. See https://bugs.kde.org/show_bug.cgi?id=198789 Tested on KDE 3.5.10 and Trinity 3.5.12. Thanks Slávek --

13 years, 6 months

[PATCH master 1/1] bnc584223.diff

by Patches＠Lincom

Hi! This is rxu_patch(a)lincomlinux.org. I'm writing this email to send a new patch to the list. The Reply-To for this email address is: robxu9 <AT> gmail <DOT> com. Mailing lists may change this depending on configured settings. The preferred method is to reply to the list. Thanks! Patches At Lincom. Patch is included below: Fixes bnc#584223, which is a security issue noted on CVE-2010-0436. It is referenced here: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0436 --- kdebase-3.5.10/kdm/backend/ctrl.c.sav 2010-03-23 13:22:28.000000000 +0100 +++ kdebase-3.5.10/kdm/backend/ctrl.c 2010-03-23 14:21:48.619350322 +0100 @@ -78,7 +78,25 @@ nukeSock( struct cmdsock *cs ) } +#ifdef HONORS_SOCKET_PERMS static CtrlRec ctrl = { 0, 0, -1, 0, 0, { -1, 0, 0 } }; +#else +static CtrlRec ctrl = { 0, 0, 0, -1, 0, 0, { -1, 0, 0 } }; + +static int mkTempDir( char *dir ) +{ + int i, l = strlen( dir ) - 6; + + for (i = 0; i < 100; i++) { + randomStr( dir + l ); + if (!mkdir( dir, 0700 )) + return True; + if (errno != EEXIST) + break; + } + return False; +} +#endif void openCtrl( struct display *d ) @@ -140,22 +158,50 @@ openCtrl( struct display *d ) if (strlen( cr->path ) >= sizeof(sa.sun_path)) LogError( "path %\"s too long; no control sockets will be available\n", cr->path ); - else if (mkdir( sockdir, 0755 ) && errno != EEXIST) +#ifdef HONORS_SOCKET_PERMS + else if (mkdir( sockdir, 0700 ) && errno != EEXIST) LogError( "mkdir %\"s failed; no control sockets will be available\n", sockdir ); + else if (unlink( cr->path ) && errno != ENOENT) + LogError( "unlink %\"s failed: %m; control socket will not be available\n", + cr->path ); else { - if (!d) - chown( sockdir, -1, fifoGroup ); +#else + else if (unlink( sockdir ) && errno != ENOENT) + LogError( "unlink %\"s failed: %m; control socket will not be available\n", + sockdir ); + else if (!strApp( &cr->realdir, sockdir, "-XXXXXX", (char *)0)) + ; + else if (!mkTempDir( cr->realdir )) { + LogError( "mkdir %\"s failed: %m; control socket will not be available\n", + cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; + } else if (symlink( cr->realdir, sockdir )) { + LogError( "symlink %\"s => %\"s failed: %m; control socket will not be available\n", + sockdir, cr->realdir ); + rmdir( cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; + } else { + chown( sockdir, 0, d ? 0 : fifoGroup ); chmod( sockdir, 0750 ); +#endif if ((cr->fd = socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) LogError( "Cannot create control socket\n" ); else { - unlink( cr->path ); sa.sun_family = AF_UNIX; strcpy( sa.sun_path, cr->path ); if (!bind( cr->fd, (struct sockaddr *)&sa, sizeof(sa) )) { if (!listen( cr->fd, 5 )) { +#ifdef HONORS_SOCKET_PERMS + chmod( cr->path, 0660 ); + if (!d) + chown( cr->path, -1, fifoGroup ); + chmod( sockdir, 0755 ); +#else chmod( cr->path, 0666 ); +#endif RegisterCloseOnFork( cr->fd ); RegisterInput( cr->fd ); free( sockdir ); @@ -170,6 +216,14 @@ openCtrl( struct display *d ) close( cr->fd ); cr->fd = -1; } +#ifdef HONORS_SOCKET_PERMS + rmdir( sockdir ); +#else + unlink( sockdir ); + rmdir( cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; +#endif } free( cr->path ); cr->path = 0; @@ -190,7 +244,14 @@ closeCtrl( struct display *d ) cr->fd = -1; unlink( cr->path ); *strrchr( cr->path, '/' ) = 0; +#ifdef HONORS_SOCKET_PERMS rmdir( cr->path ); +#else + unlink( cr->path ); + rmdir( cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; +#endif free( cr->path ); cr->path = 0; while (cr->css) { @@ -218,12 +279,12 @@ chownCtrl( CtrlRec *cr, int uid ) { if (cr->fpath) chown( cr->fpath, uid, -1 ); - if (cr->path) { - char *ptr = strrchr( cr->path, '/' ); - *ptr = 0; + if (cr->path) +#ifdef HONORS_SOCKET_PERMS chown( cr->path, uid, -1 ); - *ptr = '/'; - } +#else + chown( cr->realdir, uid, -1 ); +#endif } void --- kdebase-3.5.10/kdm/backend/dm.h.sav 2010-03-23 13:22:28.401354858 +0100 +++ kdebase-3.5.10/kdm/backend/dm.h 2010-03-23 13:28:24.843351116 +0100 @@ -218,6 +218,9 @@ typedef struct { struct cmdsock *css; /* open connections */ char *path; /* filename of the socket */ +#ifndef HONORS_SOCKET_PERMS + char *realdir; /* real dirname of the socket */ +#endif int fd; /* fd of the socket */ int gid; /* owner group of the socket */ --- kdebase-3.5.10/config.h.in.sav 2008-08-20 18:00:23.000000000 +0200 +++ kdebase-3.5.10/config.h.in 2010-03-23 13:36:38.913475918 +0100 @@ -739,6 +739,9 @@ /* Defined if your system has XRandR support */ #undef XRANDR_SUPPORT +/* Define to 1 if OS honors permission bits on socket inodes */ +#undef HONORS_SOCKET_PERMS + /* * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system * headers and I'm too lazy to write a configure test as long as only --- kdebase-3.5.10/configure.in.in.sav 2006-07-22 10:15:55.000000000 +0200 +++ kdebase-3.5.10/configure.in.in 2010-03-23 13:51:24.504477535 +0100 @@ -274,3 +274,31 @@ AC_SUBST(LIBART_RPATH) AC_ARG_WITH([composite], AC_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) ) +AC_TRY_RUN([ +#include <sys/socket.h> +#include <sys/un.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <string.h> +#include <unistd.h> +#include <errno.h> +int main() +{ + int fd, fd2; + struct sockaddr_un sa; + + if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) + return 2; + sa.sun_family = AF_UNIX; + strcpy(sa.sun_path, "testsock"); + unlink(sa.sun_path); + if (bind(fd, (struct sockaddr *)&sa, sizeof(sa))) + return 2; + chmod(sa.sun_path, 0); + setuid(getuid() + 1000); + if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) + return 2; + connect(fd2, (struct sockaddr *)&sa, sizeof(sa)); + return errno != EACCES; +} +], AC_DEFINE_UNQUOTED(HONORS_SOCKET_PERMS, 1, [Define to 1 if OS honors permission bits on socket inodes]))

13 years, 6 months

July Meeting

by Robert Xu

Meeting Tuesday 26 July 2011 - 1400 EDT or 1900 EDT? I don't have preference right now, but I'd like to know people's thoughts. -- later, Robert Xu + rxu AT lincomlinux DOT org

13 years, 6 months

Tiny patch for kdelibs

by Marko Käning

Hi devs, I realized that kdelibs version 3.5.12 still has a bug which hit me very recently with 3.5.10 on Mac OS X Lion. The linker was obviously less forgiving concerning undeclared external functions caused due to missing header files, like stdio.h. Please check out http://trac.macports.org/ticket/30314 and see the patch at http://trac.macports.org/browser/trunk/dports/kde/kdelibs3/files/patch-stdi… which made building possible on Lion. Since it's of general platform-independent interest I thought I better post this here as well. Greets, Marko

13 years, 6 months

Trinity on OSX via MacPorts

by Marko Käning

Hi devs, yesterday I had a very pleasant chat via IRC with kb9vqf on #trinity-desktop concerning the topic of bringing trinity to Mac OS X. Since the ports qt3 and qt3-mac as well as all the KDE3 stuff aren't really maintained anymore on MacPorts it would be very interesting to try and port trinity for the Mac more natively. I'll try to set build your latest version of qt3 (3.3.8d?) from your git repo. (From the current qt3 port sources at MacPorts I see that already tons of patches are incorporated…) Once that is figured out I would try to move forward with kdelibs, kdepimlibs, kderuntime and probably others. My final objective is to bring trinity on MacPorts to a stage that KMyMoney 1.0.5 can be build, since KMyMoney4 on KDE4 on MacOSX still shows loads of quircks and is noticeably slower as well. But I guess this might be a long way, since all the X11 stuff and god knows what else needs to be working nicely with trinity. For that I guess I should at first know which dependencies I need to fulfill to successfully build qt3 for a start. Hints and help welcome. :-) I am surprised and happy about the fact that KDE3 isn't dead. I know that KDE4 has many interesting and modern features and technologies, but it's unfortunately still not as stable as the mature 3.5.*. I guess it tries to much to become more like MacOSX… I always liked KDE3 on my Linuxes during the past years, so it's great to know that there is a community which is still trying to keep this nice project going. Greets, Marko

13 years, 6 months

[PATCH] media-teardown_crypto.diff

by Patches＠Lincom

NOTE: This is a resubmitted patch. Hi! This is rxu_patch(a)lincomlinux.org. I'm writing this email to send a new patch to the list. The Reply-To for this email address is: robxu9 <AT> gmail <DOT> com. Mailing lists may change this depending on configured settings. The preferred method is to reply to the list. Thanks! Patches At Lincom. Patch is included below: --- Index: kioslave/media/mediamanager/halbackend.cpp =================================================================== --- kioslave/media/mediamanager/halbackend.cpp.orig 2011-05-31 13:41:55.000000000 +0200 +++ kioslave/media/mediamanager/halbackend.cpp 2011-05-31 13:42:48.317334543 +0200 @@ -1379,4 +1379,54 @@ QString HALBackend::unmount(const QStrin return QString(); } +bool HALBackend::teardown(const QString &_udi) +{ + const char* dm_udi = _udi.latin1(); + const QString blockudi = libhal_device_get_property_QString(m_halContext, dm_udi, "volume.crypto_luks.clear.backing_volume"); + if (!blockudi.isEmpty()) { + const char* udi = blockudi.latin1(); + DBusMessage *dmesg, *reply; + DBusError error; + const char *options[2]; + + kdDebug() << "tearDown " << udi << "..." << endl; + + dbus_error_init(&error); + DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); + if (dbus_error_is_set(&error)) + { + dbus_error_free(&error); + return false; + } + + if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, + "org.freedesktop.Hal.Device.Volume.Crypto", + "Teardown"))) { + kdDebug() << "teardown failed for " << udi << ": could not create dbus message\n"; + return false; + } + + dbus_error_init (&error); + if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) + { + QString qerror; + + kdDebug() << "teardown failed for " << udi << ": " << error.name << " " << error.message << endl; + qerror = QString("teardown failed for %1 because: %2").arg(udi).arg(error.name); + dbus_message_unref (dmesg); + dbus_error_free (&error); + return false; + } + + kdDebug() << "teardown queued for " << udi << endl; + + dbus_message_unref (dmesg); + dbus_message_unref (reply); + return true; + } + + return false; +} + + #include "halbackend.moc" Index: kioslave/media/mediamanager/halbackend.h =================================================================== --- kioslave/media/mediamanager/halbackend.h.orig 2011-05-31 13:39:05.000000000 +0200 +++ kioslave/media/mediamanager/halbackend.h 2011-05-31 13:42:48.317334543 +0200 @@ -85,6 +85,7 @@ public: QString mount(const QString &id); QString mount(const Medium *medium); QString unmount(const QString &id); + bool teardown(const QString &_udi); static bool isHotplug( const QString & id ); Index: kioslave/media/mediamanager/mediamanager.cpp =================================================================== --- kioslave/media/mediamanager/mediamanager.cpp.orig 2011-05-31 13:39:05.000000000 +0200 +++ kioslave/media/mediamanager/mediamanager.cpp 2011-05-31 13:43:07.916484054 +0200 @@ -232,6 +232,17 @@ QString MediaManager::unmount(const QStr #endif } +bool MediaManager::teardown(const QString &name) +{ +#ifdef COMPILE_HALBACKEND + if (!m_halbackend) + return false; + return m_halbackend->teardown(name); +#else + return false; +#endif +} + QString MediaManager::nameForLabel(const QString &label) { const QPtrList<Medium> media = m_mediaList.list(); Index: kioslave/media/mediamanager/mediamanager.h =================================================================== --- kioslave/media/mediamanager/mediamanager.h.orig 2011-05-31 13:39:05.000000000 +0200 +++ kioslave/media/mediamanager/mediamanager.h 2011-05-31 13:42:48.318334448 +0200 @@ -47,6 +47,7 @@ k_dcop: QString mount(const QString &uid); QString unmount(const QString &uid); + bool teardown(const QString &uid); QString nameForLabel(const QString &label); ASYNC setUserLabel(const QString &name, const QString &label); Index: kioslave/media/mounthelper/kio_media_mounthelper.h =================================================================== --- kioslave/media/mounthelper/kio_media_mounthelper.h.orig 2007-01-15 12:31:31.000000000 +0100 +++ kioslave/media/mounthelper/kio_media_mounthelper.h 2011-05-31 13:42:48.318334448 +0200 @@ -40,6 +40,8 @@ private: QString m_errorStr; QString m_device; bool m_isCdrom; + bool isCryptMedia(QString); + bool teardown(QString); private slots: void ejectFinished(KProcess* proc); Index: kioslave/media/mounthelper/kio_media_mounthelper.cpp =================================================================== --- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig 2007-05-14 09:55:40.000000000 +0200 +++ kioslave/media/mounthelper/kio_media_mounthelper.cpp 2011-05-31 13:42:48.319334353 +0200 @@ -27,6 +27,7 @@ #include <dcopclient.h> #include <dcopref.h> #include <qtimer.h> +#include <qregexp.h> #include <stdlib.h> #include <kdebug.h> #include <kglobal.h> @@ -117,14 +118,17 @@ MountHelper::MountHelper() : KApplicatio DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); if (reply.isValid()) - reply.get(m_errorStr); - if (m_errorStr.isNull()) - invokeEject(device, true); - else - error(); + reply.get(m_errorStr); + if (m_errorStr.isNull()) { + if (!teardown(medium.id())) + invokeEject(device, true); + } else + error(); m_device = device; - } else - invokeEject(device, true); + } else { + if (!teardown(medium.id())) + invokeEject(device, true); + } } else { @@ -139,6 +143,19 @@ MountHelper::MountHelper() : KApplicatio } } +bool MountHelper::teardown(QString id) +{ + DCOPRef mediamanager("kded", "mediamanager"); + DCOPReply reply = mediamanager.call( "teardown", id); + if (reply.isValid()) { + bool rep; + reply.get(rep); + kdDebug() << "reply from teardown: " << rep << endl; + return rep; + } + return false; +} + void MountHelper::invokeEject(const QString &device, bool quiet) { KProcess *proc = new KProcess(this);

13 years, 6 months

[PATCH master 1/1] openssl1.patch

by Patches＠Lincom

13 years, 6 months

FTBFS: kdenetwork and probably other packages

by Nix

Obviously I am missing something. I tried to build kdenetwork from svn. I had to use autoconf because CMake is not ready... but it failed, horribly. What's worse, because of the use of TQt constructs in the Trinity versin of installed headers, compiling the *original* KDE-upstream kdenetwork also failed. The log of the failure indicates that, well, as far as I can tell at least one required header is not being included by the uic-generated code, and there may be other problems. (I had to hack acinclude.m4.in to look for tqt in /usr/kde3/include/tqt and to pick up the Qt3 headers from /usr/include/Qt, where I stash them in order to not conflict with Qt 4: the hackage may be wrong because there is quite a tangle of headers there and I got a bit lost). Is the stuff in the SVN tree *supposed* to be buildable yet? /bin/sh ../../../libtool --tag=CXX --mode=compile c++ -DHAVE_CONFIG_H -I. -I../../.. -I/usr/kde3/include -I/usr/include/Qt -I. -DQT_THREAD_SUPPORT -D__NO_STRING_INLINES -D__NO_MATH_INLINES -D_LARGEFILE64_SOURCE -D_REENTRANT -D_LARGE_FILES=1 -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -fpermissive -Wstrict-overflow=1 -g -gdwarf-4 -feliminate-dwarf2-dups -feliminate-unused-debug-types -fvar-tracking-assignments -O2 -pipe -ffast-math -D__NO_STRING_INLINES -D__NO_MATH_INLINES -D_LARGEFILE64_SOURCE -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -I/usr/kde3/include/tqt -fvisibility=hidden -fvisibility-inlines-hidden -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -MT hostprops.lo -MD -MP -MF .deps/hostprops.Tpo -c -o hostprops.lo hostprops.cpp libtool: compile: c++ -DHAVE_CONFIG_H -I. -I../../.. -I/usr/kde3/include -I/usr/include/Qt -I. -DQT_THREAD_SUPPORT -D__NO_STRING_INLINES -D__NO_MATH_INLINES -D_LARGEFILE64_SOURCE -D_REENTRANT -D_LARGE_FILES=1 -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -fpermissive -Wstrict-overflow=1 -g -gdwarf-4 -feliminate-dwarf2-dups -feliminate-unused-debug-types -fvar-tracking-assignments -O2 -pipe -ffast-math -D__NO_STRING_INLINES -D__NO_MATH_INLINES -D_LARGEFILE64_SOURCE -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -I/usr/kde3/include/tqt -fvisibility=hidden -fvisibility-inlines-hidden -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -MT hostprops.lo -MD -MP -MF .deps/hostprops.Tpo -c hostprops.cpp -fPIC -DPIC -o .libs/hostprops.o In file included from hostprops.cpp:18:0: ./hostprops.ui.h:10:29: error: no 'void HostProps::setModified()' member function declared in class 'HostProps' hostprops.cpp: In constructor 'HostProps::HostProps(QWidget*, const char*)': hostprops.cpp:31:59: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:32:18: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:32:119: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:33:18: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:34:18: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:34:35: error: incomplete type 'QGroupBox' used in nested name specifier hostprops.cpp:35:18: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:35:36: error: incomplete type 'QGroupBox' used in nested name specifier hostprops.cpp:36:87: error: no matching function for call to 'QVBoxLayout::QVBoxLayout(QGroupBox*&, int, int, const char [20])' /usr/include/Qt/qlayout.h:467:5: note: candidates are: QVBoxLayout::QVBoxLayout(const QVBoxLayout&) /usr/include/Qt/qlayout.h:461:5: note: QVBoxLayout::QVBoxLayout(int, const char*) /usr/include/Qt/qlayout.h:459:5: note: QVBoxLayout::QVBoxLayout(QLayout*, int, const char*) /usr/include/Qt/qlayout.h:457:5: note: QVBoxLayout::QVBoxLayout(QWidget*, int, int, const char*) hostprops.cpp:38:59: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:39:48: error: no matching function for call to 'QVBoxLayout::addWidget(QLabel*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:41:58: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:42:13: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:42:30: error: incomplete type 'QLineEdit' used in nested name specifier hostprops.cpp:43:13: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:43:31: error: incomplete type 'QLineEdit' used in nested name specifier hostprops.cpp:44:46: error: no matching function for call to 'QVBoxLayout::addWidget(QLineEdit*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:46:60: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:47:47: error: no matching function for call to 'QVBoxLayout::addWidget(QCheckBox*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:49:68: error: no matching function for call to 'QGridLayout::addMultiCellWidget(QGroupBox*&, int, int, int, int)' /usr/include/Qt/qlayout.h:335:10: note: candidate is: void QGridLayout::addMultiCellWidget(QWidget*, int, int, int, int, int) hostprops.cpp:51:51: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:52:14: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:52:111: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:53:81: error: no matching function for call to 'QGridLayout::QGridLayout(QGroupBox*&, int, int, int, int, const char [16])' /usr/include/Qt/qlayout.h:357:5: note: candidates are: QGridLayout::QGridLayout(const QGridLayout&) /usr/include/Qt/qlayout.h:299:5: note: QGridLayout::QGridLayout(QLayout*, int, int, int, const char*) /usr/include/Qt/qlayout.h:297:5: note: QGridLayout::QGridLayout(int, int, int, const char*) /usr/include/Qt/qlayout.h:295:5: note: QGridLayout::QGridLayout(QWidget*, int, int, int, int, const char*) hostprops.cpp:55:60: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:57:51: error: no matching function for call to 'QGridLayout::addWidget(QCheckBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:59:56: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:61:49: error: no matching function for call to 'QGridLayout::addWidget(QCheckBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:63:52: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:65:47: error: no matching function for call to 'QGridLayout::addWidget(QCheckBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:67:56: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:68:14: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:70:49: error: no matching function for call to 'QGridLayout::addWidget(QCheckBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:72:52: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:74:47: error: no matching function for call to 'QGridLayout::addWidget(QCheckBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:76:58: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:78:50: error: no matching function for call to 'QGridLayout::addWidget(QCheckBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:80:66: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:82:54: error: no matching function for call to 'QGridLayout::addWidget(QCheckBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:84:49: error: no matching function for call to 'QGridLayout::addWidget(QGroupBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:86:51: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:87:14: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:87:111: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:88:14: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:88:37: error: incomplete type 'QGroupBox' used in nested name specifier hostprops.cpp:89:75: error: no matching function for call to 'QVBoxLayout::QVBoxLayout(QGroupBox*&, int, int, const char [16])' /usr/include/Qt/qlayout.h:467:5: note: candidates are: QVBoxLayout::QVBoxLayout(const QVBoxLayout&) /usr/include/Qt/qlayout.h:461:5: note: QVBoxLayout::QVBoxLayout(int, const char*) /usr/include/Qt/qlayout.h:459:5: note: QVBoxLayout::QVBoxLayout(QLayout*, int, const char*) /usr/include/Qt/qlayout.h:457:5: note: QVBoxLayout::QVBoxLayout(QWidget*, int, int, const char*) hostprops.cpp:91:62: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:92:46: error: no matching function for call to 'QVBoxLayout::addWidget(QCheckBox*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:94:64: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:95:47: error: no matching function for call to 'QVBoxLayout::addWidget(QCheckBox*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:97:62: error: invalid use of incomplete type 'struct QLayoutWidget' hostprops.h:22:7: error: forward declaration of 'struct QLayoutWidget' hostprops.cpp:98:78: error: no matching function for call to 'QHBoxLayout::QHBoxLayout(QLayoutWidget*&, int, int, const char [17])' /usr/include/Qt/qlayout.h:448:5: note: candidates are: QHBoxLayout::QHBoxLayout(const QHBoxLayout&) /usr/include/Qt/qlayout.h:442:5: note: QHBoxLayout::QHBoxLayout(int, const char*) /usr/include/Qt/qlayout.h:440:5: note: QHBoxLayout::QHBoxLayout(QLayout*, int, const char*) /usr/include/Qt/qlayout.h:438:5: note: QHBoxLayout::QHBoxLayout(QWidget*, int, int, const char*) hostprops.cpp:100:60: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:101:47: error: no matching function for call to 'QHBoxLayout::addWidget(QLabel*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:103:61: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:104:16: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:104:117: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:105:16: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:106:46: error: no matching function for call to 'QHBoxLayout::addWidget(QLineEdit*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:107:44: error: no matching function for call to 'QVBoxLayout::addWidget(QLayoutWidget*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:109:62: error: invalid use of incomplete type 'struct QLayoutWidget' hostprops.h:22:7: error: forward declaration of 'struct QLayoutWidget' hostprops.cpp:110:78: error: no matching function for call to 'QHBoxLayout::QHBoxLayout(QLayoutWidget*&, int, int, const char [17])' /usr/include/Qt/qlayout.h:448:5: note: candidates are: QHBoxLayout::QHBoxLayout(const QHBoxLayout&) /usr/include/Qt/qlayout.h:442:5: note: QHBoxLayout::QHBoxLayout(int, const char*) /usr/include/Qt/qlayout.h:440:5: note: QHBoxLayout::QHBoxLayout(QLayout*, int, const char*) /usr/include/Qt/qlayout.h:438:5: note: QHBoxLayout::QHBoxLayout(QWidget*, int, int, const char*) hostprops.cpp:112:56: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:113:45: error: no matching function for call to 'QHBoxLayout::addWidget(QLabel*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:115:61: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:116:16: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:116:115: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:117:16: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:118:46: error: no matching function for call to 'QHBoxLayout::addWidget(QLineEdit*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:119:44: error: no matching function for call to 'QVBoxLayout::addWidget(QLayoutWidget*&)' /usr/include/Qt/qlayout.h:389:10: note: candidate is: void QBoxLayout::addWidget(QWidget*, int, int) hostprops.cpp:121:49: error: no matching function for call to 'QGridLayout::addWidget(QGroupBox*&, int, int)' /usr/include/Qt/qlayout.h:334:10: note: candidate is: void QGridLayout::addWidget(QWidget*, int, int, int) hostprops.cpp:129:86: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [15], QLineEdit*&, const char [19])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:130:76: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:131:74: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:132:72: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:133:74: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:134:75: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:135:79: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:136:77: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:137:78: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:138:91: error: no matching function for call to 'HostProps::connect(QLineEdit*&, const char [29], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:139:72: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [11], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:140:84: error: no matching function for call to 'HostProps::connect(QCheckBox*&, const char [15], QCheckBox*&, const char [18])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:141:94: error: no matching function for call to 'HostProps::connect(QLineEdit*&, const char [29], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:142:94: error: no matching function for call to 'HostProps::connect(QLineEdit*&, const char [29], HostProps* const, const char [15])' /usr/include/Qt/qobject.h:121:18: note: candidates are: static bool QObject::connect(const QObject*, const char*, const QObject*, const char*) /usr/include/Qt/qobject.h:231:13: note: bool QObject::connect(const QObject*, const char*, const char*) const hostprops.cpp:145:15: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:146:17: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:147:15: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp: In member function 'virtual void HostProps::languageChange()': hostprops.cpp:164:18: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:165:15: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:189:10: error: no matching function for call to 'QWhatsThis::add(QLineEdit*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:190:14: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:195:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:196:14: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:197:16: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:204:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:205:14: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:212:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:213:12: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:220:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:221:14: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:224:491: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:225:12: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:241:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:242:15: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:258:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:259:19: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:266:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:267:14: error: invalid use of incomplete type 'struct QGroupBox' hostprops.h:18:7: error: forward declaration of 'struct QGroupBox' hostprops.cpp:268:17: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:271:132: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:272:18: error: invalid use of incomplete type 'struct QCheckBox' hostprops.h:21:7: error: forward declaration of 'struct QCheckBox' hostprops.cpp:280:10: error: no matching function for call to 'QWhatsThis::add(QCheckBox*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:281:17: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:282:266: error: no matching function for call to 'QWhatsThis::add(QLabel*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:283:16: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit' hostprops.cpp:284:15: error: invalid use of incomplete type 'struct QLabel' hostprops.h:19:7: error: forward declaration of 'struct QLabel' hostprops.cpp:285:264: error: no matching function for call to 'QWhatsThis::add(QLabel*&, QString)' /usr/include/Qt/qwhatsthis.h:66:17: note: candidate is: static void QWhatsThis::add(QWidget*, const QString&) hostprops.cpp:286:16: error: invalid use of incomplete type 'struct QLineEdit' hostprops.h:20:7: error: forward declaration of 'struct QLineEdit'

13 years, 6 months

[PATCH master 1/1] media-teardown_crypto.diff

by Patches＠Lincom

Hi! This is rxu_patches(a)lincomlinux.org. I'm writing this email to send a new patch to the list. The Reply-To for this email address is: robxu9 <AT> gmail <DOT> com. Mailing lists may change this depending on configured settings. The preferred method is to reply to the list. Thanks! Patches At Lincom. Patch is included below: Need clarification on this patch and if we need this... Index: kioslave/media/mediamanager/halbackend.cpp =================================================================== --- kioslave/media/mediamanager/halbackend.cpp.orig 2011-05-31 13:41:55.000000000 +0200 +++ kioslave/media/mediamanager/halbackend.cpp 2011-05-31 13:42:48.317334543 +0200 @@ -1379,4 +1379,54 @@ QString HALBackend::unmount(const QStrin return QString(); } +bool HALBackend::teardown(const QString &_udi) +{ + const char* dm_udi = _udi.latin1(); + const QString blockudi = libhal_device_get_property_QString(m_halContext, dm_udi, "volume.crypto_luks.clear.backing_volume"); + if (!blockudi.isEmpty()) { + const char* udi = blockudi.latin1(); + DBusMessage *dmesg, *reply; + DBusError error; + const char *options[2]; + + kdDebug() << "tearDown " << udi << "..." << endl; + + dbus_error_init(&error); + DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); + if (dbus_error_is_set(&error)) + { + dbus_error_free(&error); + return false; + } + + if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, + "org.freedesktop.Hal.Device.Volume.Crypto", + "Teardown"))) { + kdDebug() << "teardown failed for " << udi << ": could not create dbus message\n"; + return false; + } + + dbus_error_init (&error); + if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) + { + QString qerror; + + kdDebug() << "teardown failed for " << udi << ": " << error.name << " " << error.message << endl; + qerror = QString("teardown failed for %1 because: %2").arg(udi).arg(error.name); + dbus_message_unref (dmesg); + dbus_error_free (&error); + return false; + } + + kdDebug() << "teardown queued for " << udi << endl; + + dbus_message_unref (dmesg); + dbus_message_unref (reply); + return true; + } + + return false; +} + + #include "halbackend.moc" Index: kioslave/media/mediamanager/halbackend.h =================================================================== --- kioslave/media/mediamanager/halbackend.h.orig 2011-05-31 13:39:05.000000000 +0200 +++ kioslave/media/mediamanager/halbackend.h 2011-05-31 13:42:48.317334543 +0200 @@ -85,6 +85,7 @@ public: QString mount(const QString &id); QString mount(const Medium *medium); QString unmount(const QString &id); + bool teardown(const QString &_udi); static bool isHotplug( const QString & id ); Index: kioslave/media/mediamanager/mediamanager.cpp =================================================================== --- kioslave/media/mediamanager/mediamanager.cpp.orig 2011-05-31 13:39:05.000000000 +0200 +++ kioslave/media/mediamanager/mediamanager.cpp 2011-05-31 13:43:07.916484054 +0200 @@ -232,6 +232,17 @@ QString MediaManager::unmount(const QStr #endif } +bool MediaManager::teardown(const QString &name) +{ +#ifdef COMPILE_HALBACKEND + if (!m_halbackend) + return false; + return m_halbackend->teardown(name); +#else + return false; +#endif +} + QString MediaManager::nameForLabel(const QString &label) { const QPtrList<Medium> media = m_mediaList.list(); Index: kioslave/media/mediamanager/mediamanager.h =================================================================== --- kioslave/media/mediamanager/mediamanager.h.orig 2011-05-31 13:39:05.000000000 +0200 +++ kioslave/media/mediamanager/mediamanager.h 2011-05-31 13:42:48.318334448 +0200 @@ -47,6 +47,7 @@ k_dcop: QString mount(const QString &uid); QString unmount(const QString &uid); + bool teardown(const QString &uid); QString nameForLabel(const QString &label); ASYNC setUserLabel(const QString &name, const QString &label); Index: kioslave/media/mounthelper/kio_media_mounthelper.h =================================================================== --- kioslave/media/mounthelper/kio_media_mounthelper.h.orig 2007-01-15 12:31:31.000000000 +0100 +++ kioslave/media/mounthelper/kio_media_mounthelper.h 2011-05-31 13:42:48.318334448 +0200 @@ -40,6 +40,8 @@ private: QString m_errorStr; QString m_device; bool m_isCdrom; + bool isCryptMedia(QString); + bool teardown(QString); private slots: void ejectFinished(KProcess* proc); Index: kioslave/media/mounthelper/kio_media_mounthelper.cpp =================================================================== --- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig 2007-05-14 09:55:40.000000000 +0200 +++ kioslave/media/mounthelper/kio_media_mounthelper.cpp 2011-05-31 13:42:48.319334353 +0200 @@ -27,6 +27,7 @@ #include <dcopclient.h> #include <dcopref.h> #include <qtimer.h> +#include <qregexp.h> #include <stdlib.h> #include <kdebug.h> #include <kglobal.h> @@ -117,14 +118,17 @@ MountHelper::MountHelper() : KApplicatio DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); if (reply.isValid()) - reply.get(m_errorStr); - if (m_errorStr.isNull()) - invokeEject(device, true); - else - error(); + reply.get(m_errorStr); + if (m_errorStr.isNull()) { + if (!teardown(medium.id())) + invokeEject(device, true); + } else + error(); m_device = device; - } else - invokeEject(device, true); + } else { + if (!teardown(medium.id())) + invokeEject(device, true); + } } else { @@ -139,6 +143,19 @@ MountHelper::MountHelper() : KApplicatio } } +bool MountHelper::teardown(QString id) +{ + DCOPRef mediamanager("kded", "mediamanager"); + DCOPReply reply = mediamanager.call( "teardown", id); + if (reply.isValid()) { + bool rep; + reply.get(rep); + kdDebug() << "reply from teardown: " << rep << endl; + return rep; + } + return false; +} + void MountHelper::invokeEject(const QString &device, bool quiet) { KProcess *proc = new KProcess(this);

13 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

tde-devels