tde-devels

devels@trinitydesktop.org

1 participants
3804 discussions

[PATCH master 1/1] media-teardown_crypto.diff
by Patches＠Lincom 20 Jul '11

20 Jul '11

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);

1 0

[PATCH] Qt3 ODBC support
by Calvin Morrison 19 Jul '11

19 Jul '11

Hello, While running through a number of patches, it seems that this one still has not been included in our Qt3 tree It adds support for newer platform namings (as far as I can see) from SQLLEN and SQLINTEGER seems to patch without a problem Calvin Morrison

2 1

[PATCH] kdebase: use pkgconfig to find dbus-tqt
by Nix 19 Jul '11

19 Jul '11

This looks for dbus-tqt using pkg-config, rather than explicitly hardwiring it (though the compilation test is retained). This fixes the case where dbus-tqt is installed using a different prefix from Qt or dbus itself. This is fairly common these days (I have kde3 installed in /usr/kde3, but Qt3 is installed in /usr, because non-KDE3 programs need it.) It requires my previous dbus-tqt pkgconfig patch. Index: ConfigureChecks.cmake =================================================================== --- ConfigureChecks.cmake (revision 1242239) +++ ConfigureChecks.cmake (working copy) @@ -189,9 +189,10 @@ endif( ) # check for dbus-tqt + pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - set( CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIRS} ) - set( CMAKE_REQUIRED_LIBRARIES ${TQT_LDFLAGS} ) + set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) + set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ) check_cxx_source_compiles(" #include <tqt.h> #include <dbus/connection.h> -- NULL && (void)

1 1

[PATCH] dbus-tqt: pkgconfig fixes
by Nix 19 Jul '11

19 Jul '11

These fixes make it possible to use pkgconfig to locate dbus-tqt, while using the normal #include <dbus/connection.h> pattern to include it. Used by the following kdebase patch. Index: dbus-tqt.pc.cmake =================================================================== --- dbus-tqt.pc.cmake (revision 1242244) +++ dbus-tqt.pc.cmake (working copy) @@ -6,5 +6,6 @@ Name: @PROJECT_NAME@ Description: D-BUS TQt bindings Version: @VERSION@ +Requires: dbus-1 Libs: -L${libdir} @PC_LIBRARIES@ -Cflags: -I${includedir} +Cflags: -I${includedir}/dbus-1.0 -- NULL && (void)

1 0

[PATCH] arts: find libmad without pkgconfig
by Nix 19 Jul '11

19 Jul '11

The most recent libmad release does not use pkgconfig, and while some distributors have gone ahead and provided a .pc file, not all have. This fixes it for the non-pkgconfig case. Index: flow/gsl/CMakeLists.txt =================================================================== --- flow/gsl/CMakeLists.txt (revision 1242076) +++ flow/gsl/CMakeLists.txt (working copy) @@ -63,7 +63,11 @@ if( MAD_FOUND ) set( GSL_HAVE_LIBMAD 1 ) else( MAD_FOUND ) - message(FATAL_ERROR "\nMAD support are requested, but `libmad` not found" ) + find_library( MAD_LIBRARIES NAMES mad ) + find_path( MAD_INCLUDE_DIRS mad.h ) + if( NOT MAD_LIBRARIES ) + message(FATAL_ERROR "\nMAD support is requested, but `libmad` not found" ) + endif( NOT MAD_LIBRARIES ) endif( MAD_FOUND ) endif( WITH_MAD )

1 0

July Meeting (um...)
by Robert Xu 18 Jul '11

18 Jul '11

Hi all, As was stated before, there's supposed to be a July Meeting tomorrow. But, we do not know if everyone is ready (especially with the Etherpad purge). So, could everyone please tell me what they think about the meeting still happening tomorrow? If I get enough (I have something to share) or (II think we should have it) I will keep it to tomorrow. Else, I will postpone it one week. -- later, Robert Xu + rxu AT lincomlinux DOT org

1 1

Important about arch
by Calvin Morrison 18 Jul '11

18 Jul '11

Hey! I just got a message from the arch dev ML. They are talking about kdelibs3 and someone mentioned us. Are we compatible with old kdelibs3? We could start providing upstream support and also for qt3 Sorry I don't have any links or more info, this is a rushed message. Calvin

1 0

xdrawchem
by Ilya Chernykh 18 Jul '11

18 Jul '11

Does Trinity include xdrawchem? If yes, how did you patch it for libopenbabel4-2.3.0 ?

1 0

HAL removed from openSUSE
by Ilya Chernykh 16 Jul '11

16 Jul '11

Now it comes. There is no HAL in Factory any more.

2 1

svn.trinitydesktop.org...?
by Robert Xu 11 Jul '11

11 Jul '11

Can someone tell me where it went/etc? -- later, Robert Xu + rxu AT lincomlinux DOT org

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

tde-devels